| commit | 0cda81e3d4fe528aa725f79501d41697dd1ed36f | [log] [tgz] |
|---|---|---|
| author | Stanley Tng <stng@google.com> | Tue Dec 11 14:45:13 2018 -0800 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Wed Jan 16 18:56:53 2019 +0000 |
| tree | 26f3d020cc0e92cff94d9f21e779b2446d576d6f | |
| parent | 5b8bd2429d128b91c52b17e6a06d299c3a5f4408 [diff] |
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 3deb5ec3e16806e4ba7e5fef71060f1697dfff14) (cherry picked from commit 5cab7c92a3fdbb22cc24a3a2814a9f63c5e9f148) (cherry picked from commit 401f39f07469b520ac5dbb064fe79239da04924c)
Just build AOSP - Fluoride is there by default.
Instructions for Ubuntu, tested on 14.04 with Clang 3.5.0 and 16.10 with Clang 3.8.0
mkdir ~/fluoride cd ~/fluoride git clone https://android.googlesource.com/platform/packages/modules/Bluetooth/system
Install dependencies (require sudo access):
cd ~/fluoride/bt build/install_deps.sh
Then fetch third party dependencies:
cd ~/fluoride/bt mkdir third_party cd third_party git clone https://github.com/google/googletest.git git clone https://android.googlesource.com/platform/external/aac git clone https://android.googlesource.com/platform/external/libchrome git clone https://android.googlesource.com/platform/external/libldac git clone https://android.googlesource.com/platform/external/modp_b64 git clone https://android.googlesource.com/platform/external/tinyxml2
And third party dependencies of third party dependencies:
cd fluoride/bt/third_party/libchrome/base/third_party mkdir valgrind cd valgrind curl https://chromium.googlesource.com/chromium/src/base/+/master/third_party/valgrind/valgrind.h?format=TEXT | base64 -d > valgrind.h curl https://chromium.googlesource.com/chromium/src/base/+/master/third_party/valgrind/memcheck.h?format=TEXT | base64 -d > memcheck.h
NOTE: If packages/modules/Bluetooth/system is checked out under AOSP, then create symbolic links instead of downloading sources
cd packages/modules/Bluetooth/system mkdir third_party cd third_party ln -s ../../../external/aac aac ln -s ../../../external/libchrome libchrome ln -s ../../../external/libldac libldac ln -s ../../../external/modp_b64 modp_b64 ln -s ../../../external/tinyxml2 tinyxml2 ln -s ../../../external/googletest googletest
cd ~/fluoride/bt gn gen out/Default
cd ~/fluoride/bt ninja -C out/Default all
This will build all targets (the shared library, executables, tests, etc) and put them in out/Default. To build an individual target, replace "all" with the target of your choice, e.g. ninja -C out/Default net_test_osi.
cd ~/fluoride/bt/out/Default LD_LIBRARY_PATH=./ ./bluetoothtbd -create-ipc-socket=fluoride
Follows the Chromium project Eclipse Setup Instructions until "Optional: Building inside Eclipse" section (don't do that section, we will set it up differently)
Generate Eclipse settings:
cd packages/modules/Bluetooth/system gn gen --ide=eclipse out/Default
In Eclipse, do File->Import->C/C++->C/C++ Project Settings, choose the XML location under packages/modules/Bluetooth/system/out/Default
Right click on the project. Go to Preferences->C/C++ Build->Builder Settings. Uncheck "Use default build command", but instead using "ninja -C out/Default"
Goto Behaviour tab, change clean command to "-t clean"