OSDN Git Service

DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu
authorStanley Tng <stng@google.com>
Tue, 11 Dec 2018 22:45:13 +0000 (14:45 -0800)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 16 Jan 2019 18:56:11 +0000 (18:56 +0000)
commita03e6ad5c458580ad7635bde6ab664eed4976493
tree1efb39995950ff2fd404e5b1b5e88f700803945e
parent47719599fac932e15d0f238316931852dfb5848a
DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu

Add check to make sure that data buffer is big enough to read the 2
bytes for length.

Also, fix a regression from the previous CL that checks the buffer length
before doing a memcpy. The previous check is too strict causing valid
sized buffers to be rejected. The length check is incorrect and off by the header size.

Bug: 120665616
Test: Run the SL4A Test for LE CoC, BleCoCTest
Merged-In: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
Change-Id: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
(cherry picked from commit fcb1994de1f6ee34b8dc6804a2b32e20bf138073)
(cherry picked from commit 1f1d8b97d80d25023c4c7b04d2aa18d367f4158d)
(cherry picked from commit 6b2739f309f7719086eb8201b3e1a35ba60035f4)
(cherry picked from commit 8f52ed93ba0fe67c310473b539d37c7201c83454)
stack/l2cap/l2c_fcr.cc