summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakirilov <akirilov@google.com>2018-05-21 12:56:17 -0700
committerTim Schumacher <timschumi@gmx.de>2018-08-08 21:44:58 +0200
commit5232ac1452a7c818c71b30345e138138538904f6 (patch)
tree53d5b257c08dc8e607bbc271a7fc986f2c957cca
parentb7ea5ae197085e2b985b86cb29f47b44e4e9f578 (diff)
downloadandroid_system_bt-5232ac1452a7c818c71b30345e138138538904f6.tar.gz
android_system_bt-5232ac1452a7c818c71b30345e138138538904f6.tar.bz2
android_system_bt-5232ac1452a7c818c71b30345e138138538904f6.zip
RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)
Bug: 74075873 Test: manual test (poc in bug) Change-Id: I56e87cfdf8731acca00cefac98abb2ba06f6e7ed (cherry picked from commit 3575ba8ca36dccf7dcdb2dbf16ed170d549911d3)
-rw-r--r--stack/sdp/sdp_discovery.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/stack/sdp/sdp_discovery.c b/stack/sdp/sdp_discovery.c
index ecbd4b254..1aab8c110 100644
--- a/stack/sdp/sdp_discovery.c
+++ b/stack/sdp/sdp_discovery.c
@@ -391,7 +391,7 @@ static void sdp_copy_raw_data (tCONN_CB *p_ccb, BOOLEAN offset)
type = *p++;
p = sdpu_get_len_from_type (p, type, &list_len);
}
- if(list_len && list_len < cpy_len )
+ if(list_len < cpy_len)
{
cpy_len = list_len;
}