From: Pavlin Radoslavov <pavlin@google.com>
Date: Mon, 17 Jul 2017 23:03:21 +0000 (-0700)
Subject: Add missing extension length check while parsing BNEP control packets
X-Git-Tag: android-x86-8.1-r1~20^2~2^2^2~6^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc7700a43189d2a8607b69ae19a6d646f11ddf51;p=android-x86%2Fsystem-bt.git

Add missing extension length check while parsing BNEP control packets

Bug: 63146237
Test: External script
Change-Id: I4e519cec1c7dffb8bd42add00bd891e0969a3d9f
(cherry picked from commit 9ab89b7dbe5735b796799f65144efa48595d0230)
---

diff --git a/stack/bnep/bnep_utils.cc b/stack/bnep/bnep_utils.cc
index 3f5e13eba..ed4d712aa 100644
--- a/stack/bnep/bnep_utils.cc
+++ b/stack/bnep/bnep_utils.cc
@@ -832,7 +832,7 @@ uint8_t* bnep_process_control_packet(tBNEP_CONN* p_bcb, uint8_t* p,
       BNEP_TRACE_ERROR("%s: BNEP - bad ctl pkt type: %d", __func__,
                        control_type);
       bnep_send_command_not_understood(p_bcb, control_type);
-      if (is_ext) {
+      if (is_ext && (ext_len > 0)) {
         if (*rem_len < (ext_len - 1)) {
           goto bad_packet_length;
         }