commit 0277c560ede3ab954d91b33a4f08a689ebd8f4ed
author Hansong Zhang <hsz@google.com> Tue Oct 06 14:48:27 2020 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Thu Nov 12 18:35:17 2020 +0000
tree fc7ca50ac61aeca461d19a341797d4ebd33db64e
parent 0142639ad5d4cc5389039d368b2c19bf972b69d5

Fix a security issue in sdp_server.cc

Bug: 169342531
Test: POC
Change-Id: I0e8cdb9a00184f62d11fb06bc30f07b2a35bc49e
(cherry picked from commit d7573f4fa9007ab7750edfc56305eea97c525cdb)

stack/sdp/sdp_server.cc

diff --git a/stack/sdp/sdp_server.cc b/stack/sdp/sdp_server.cc
index 44cc7ba..2009dda 100644
--- a/stack/sdp/sdp_server.cc
+++ b/stack/sdp/sdp_server.cc
@@ -118,9 +118,11 @@
 
   if (p_req + sizeof(pdu_id) + sizeof(trans_num) > p_req_end) {
     android_errorWriteLog(0x534e4554, "69384124");
+    android_errorWriteLog(0x534e4554, "169342531");
     trans_num = 0;
     sdpu_build_n_send_error(p_ccb, trans_num, SDP_INVALID_REQ_SYNTAX,
                             SDP_TEXT_BAD_HEADER);
+    return;
   }
 
   /* The first byte in the message is the pdu type */
@@ -131,8 +133,10 @@
 
   if (p_req + sizeof(param_len) > p_req_end) {
     android_errorWriteLog(0x534e4554, "69384124");
+    android_errorWriteLog(0x534e4554, "169342531");
     sdpu_build_n_send_error(p_ccb, trans_num, SDP_INVALID_REQ_SYNTAX,
                             SDP_TEXT_BAD_HEADER);
+    return;
   }
 
   BE_STREAM_TO_UINT16(param_len, p_req);