mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-03 10:02:28 +00:00
202033c013
This adds 3 expat patches for n-asb-2022-09 from https://github.com/syphyr/android_external_expat/commits/cm-14.1 and also applies 2 of them to 15.1 Signed-off-by: Tad <tad@spotco.us>
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alisher Alikhodjaev <alisher@google.com>
|
|
Date: Thu, 17 Mar 2022 15:39:20 -0700
|
|
Subject: [PATCH] Out of Bounds Read in nfa_dm_check_set_config
|
|
|
|
Bug: 221216105
|
|
Test: build ok
|
|
Change-Id: I1930de8531f6c15e6be400a7b1ab3e7cf86b4229
|
|
(cherry picked from commit 88c5c267e889699c71412022e3fcb03d20100e99)
|
|
Merged-In: I1930de8531f6c15e6be400a7b1ab3e7cf86b4229
|
|
---
|
|
src/nfa/dm/nfa_dm_main.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/src/nfa/dm/nfa_dm_main.c b/src/nfa/dm/nfa_dm_main.c
|
|
index e146009..3f21261 100644
|
|
--- a/src/nfa/dm/nfa_dm_main.c
|
|
+++ b/src/nfa/dm/nfa_dm_main.c
|
|
@@ -28,6 +28,7 @@
|
|
#include "nfa_sys.h"
|
|
#include "nfa_dm_int.h"
|
|
#include "nfa_sys_int.h"
|
|
+#include <log/log.h>
|
|
|
|
|
|
/*****************************************************************************
|
|
@@ -247,6 +248,13 @@ tNFA_STATUS nfa_dm_check_set_config (UINT8 tlv_list_len, UINT8 *p_tlv_list, BOOL
|
|
len = *(p_tlv_list + xx + 1);
|
|
p_value = p_tlv_list + xx + 2;
|
|
p_cur_len = NULL;
|
|
+ if (len > (tlv_list_len - xx - 2))
|
|
+ {
|
|
+ NFA_TRACE_ERROR2 ("error: invalid TLV length: t:0x%x, l:%d",
|
|
+ type, len);
|
|
+ android_errorWriteLog(0x534e4554, "221216105");
|
|
+ return NFA_STATUS_FAILED;
|
|
+ }
|
|
|
|
switch (type)
|
|
{
|