summaryrefslogtreecommitdiff
path: root/system/stack/sdp
AgeCommit message (Collapse)Author
2025-03-13stack: Inline methods from stack_metrics_logging.h Henri Chataing
Bug: 401588157 Test: m com.android.bt Flag: EXEMPT, no logical change Change-Id: I1cf4a5e3664f4afc3eb2cfebbf23642c568403a4
2025-02-26Merge "Enforce -Wmissing-prototypes" into main am: b504bc2074 am: 8f1b0ed3d3 Henri Chataing
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3506659 Change-Id: Id6056464f1f0916e85b673a728a35230bd3aad2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-26Enforce -Wmissing-prototypes Henri Chataing
Bug: 369381361 Test: m com.android.bt Flag: EXEMPT, no logical change Change-Id: I88e569e1e0b6c04716fa48345c1ede816fb405a3
2024-12-19Fix OOB read in add_attr Brian Delwiche
It is possible in exceptional cases for add_attr to be passed a p pointer one byte short of its p_end pointer, which leads to an OOB read as it attempts to read the type of the next attribute. Add a check for this. Bug: 367274727 Test: m libbluetooth Ignore-AOSP-First: security Tag: security Flag: EXEMPT trivial validity check Change-Id: I4b5fcbce3c0f6a767356593aade7d7d871da974c
2024-12-16Merge "system: Convert base::StringPrintf to std::format" into main am: ↵ Henri Chataing
8c74fcfb8b am: b99dcfa40f Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3407745 Change-Id: I3204b9b49e3e1fb088d73d3af325876f62b9d2bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-16Merge "system: Convert base::StringPrintf to std::format" into main Henri Chataing
2024-12-12system: Convert base::StringPrintf to std::format Henri Chataing
Bug: 331817295 Test: m com.android.btservices Flag: EXEMPT, mechanical refactor Change-Id: Ib6933af3c28a1d429ea0cb6e3eae05b53fc9f2b4
2024-11-21Merge "system: Migrate from {fmt} to std::format" into main am: 3723874896 ↵ Henri Chataing
am: 648e440e0d Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3345590 Change-Id: I803c2c60053beaf4439a7090b0daa8dd0c7cfba4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-21Merge "system: Migrate from {fmt} to std::format" into main am: 3723874896 Henri Chataing
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3345590 Change-Id: Ic088a9f449b1485ea9b26eb9b9e7ae3ead976640 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-20system: Migrate from {fmt} to std::format Henri Chataing
Bug: 305066880 Test: m com.android.btservices Flag: EXEMPT, log change Change-Id: If1dbab99250a4f62626206fc9f73d27e71ebab56
2024-11-13Merge 24Q4 (ab/12406339) into aosp-main-future Xin Li
Bug: 370570306 Merged-In: I960393bbaa3d9fc4c40e6873686ea23666ddbe94 Change-Id: I6f67c9e978f13c6b2d24c782964eec02b55e5853
2024-11-08Merge "sdp_db.cc: reduce indendation" into main am: 38d0ce685e am: fa35115036 Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3342286 Change-Id: I2d075206592132588423b364441dfcc3d475ee8c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-07sdp_db.cc: reduce indendation Jakub Pawlowski
Same code, but easier on eyes Bug: None Test: mma -j32 Flag: exempt, no functional change Change-Id: I5be3777ba00dbcb9b94430ca6fedf70c94bae146
2024-11-06Fix more memory-unsafe logging Brian Delwiche
In various locations around the stack, log statements use structures that may, in exceptional cases, have been freed by preceding calls. This can lead to use after free and potentially to security vulnerabilities. Use local variables instead, or store the length before the call if no local variable is already convenient. Bug: 375404242 Bug: 375398779 Bug: 375397720 Bug: 375397164 Bug: 375397370 Bug: 375396810 Bug: 375159652 Bug: 375160214 Bug: 375159480 Test: m libbluetooth Test: researcher POC Flag: EXEMPT trivial logic fix Ignore-AOSP-First: security Tag: #security Change-Id: Ia50e074de751661a0e617bfffa17871497b8d1ea
2024-10-31Merge "Fix incorrect logging in sdp_server" into main Brian Delwiche
2024-10-31Merge "Fix incorrect logging in sdp_discovery" into main Brian Delwiche
2024-10-31Fix incorrect logging in sdp_server Brian Delwiche
In the function process_service_search_attr_req of sdp_server.cc, a log statement uses a structure that may, in exceptional cases, have been freed by preceding calls. This can lead to use after free and potentially to security vulnerabilities. Use local variables instead. Bug: 375407167 Test: m libbluetooth Test: researcher POC Flag: EXEMPT trivial logic fix Ignore-AOSP-First: security Tag: #security Change-Id: I04a295f3c451267aaad0f0d22401b9f5b5510d83
2024-10-30Fix incorrect logging in sdp_discovery Brian Delwiche
In two locations in sdp_discovery.cc, log statements use structures that may, in exceptional cases, have been freed by preceding calls. This can lead to use after free and potentially to security vulnerabilities. Use local variables instead. Bug: 375408314 Bug: 375409435 Test: m libbluetooth Test: researcher POC Flag: EXEMPT trivial logic fix Ignore-AOSP-First: security Tag: #security Change-Id: I76e1ffa1fe463a5858d61d025447d855ff6b5b84
2024-10-29Merge "system/stack/sdp: Fix -Wmissing-prototype errors" into main am: ↵ Treehugger Robot
69bd11a183 am: 30b5b585c6 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3323438 Change-Id: I1b11f22aa25840a0eeb8c7699cdbb40d0728f6c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-28system/stack/sdp: Fix -Wmissing-prototype errors Henri Chataing
Bug: 369381361 Test: m com.android.btservices Flag: EXEMPT, no logical change Change-Id: I1e3c65bf3ea8829fe4464bf4ed7c3df161676ddb
2024-10-12Merge "sdp: Use ERTM for PTS testing" into main am: 16c2e2a994 am: 15d6ef8301 Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3301238 Change-Id: If955424bf6af714871caa15179101e80f3b45215 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-11sdp: Use ERTM for PTS testing Łukasz Rymanowski
To avoid creating additional tools, use SDP for testing L2CAP/FOC test cases Bug:371947246 Flag: TEST_ONLY Test: mmm packages/modules/Bluetooth Test: PTS Change-Id: Iaa34cdaa5c9e30607a8ef0a040219eb2edd63aac
2024-09-26Enforce -Wmissing-prototypes am: 22f5e11b2e am: bf057d139c Henri Chataing
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3279796 Change-Id: Iafd4721d2f43f4c0246b79dca33e9cf4fef61e7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-25Enforce -Wmissing-prototypes Henri Chataing
This lint check will raise an error if a function is implemented without a corresponding prototype declaration included in scope. The main use case will be to ensure mock functions do not become out of sync causing the original function to be linked instead. Because of the large amount of errors, this change suppresses errors in all locations, to be cleaned up gradually. Bug: 369381361 Test: m com.android.btservices Flag: EXEMPT, lint fixes Change-Id: I888b5e284e237d8a6e2864bdde55c0a7fc0c348d
2024-09-11Merge "Fix UAF in sdp_discovery.cc" into main Brian Delwiche
2024-09-11Fix UAF in sdp_discovery.cc Brian Delwiche
It is possible with modifications to a client to open two connections against the same SDP discovery database. If this happens, it becomes possible to reference a freed instance of the discovery database in the second connection once the first one is closed. To guard against this, check during discovery if a database has already been allocated, and abort iff it has. Also, add a null check to process_service_search_attr_rsp to guard against unchecked calls to the SDP discovery database. Bug: 291281168 Bug: 356201480 Flag: com.android.bluetooth.flags.btsec_check_valid_discovery_database Test: atest bluetooth_test_gd_unit, net_test_stack_sdp Tag: #security Ignore-AOSP-First: Security Change-Id: I65495091936a81d95cd1fd73c7456805a715d5bf
2024-09-10[22/25] stack::sdp Use stack::l2cap::get_interface() Chris Manton
Bug: 343808590 Test: m . Flag: EXEMPT, Mechanical Refactor Change-Id: I24d81356f5145aad0166c3e45ca4262bc642d54b
2024-09-05Dump SDP control blocks when initiator resource limit reached Chris Manton
Bug: 364657004 Test: atest net_test_stack_sdp Flag: EXEMPT, Logging Change Change-Id: Ia3c370fef69d8894d96e54a826da55f2a2f275f3
2024-08-30stack::l2cap class enum-ify tL2CAP_CONN Chris Manton
Bug: 363111728 Test: m . Flag: EXEMPT, Mechanical Refactor Change-Id: I939f82f7d4d18e5419e14140057dfff6e09a6e7a
2024-08-09stack::sdp [1/7] cpp lint fixes Chris Manton
Bug: 358484051 Test: m . Flag: EXEMPT, Lint fixes Change-Id: I87babbe90d3bcb2b6c3662066d846aebe28249b9
2024-08-07stack::sdp Class enum-ify tSDP_STATUS Chris Manton
Bug: 358146225 Test: m . Flag: EXEMPT, Class Enumification Change-Id: Ifbdd4157dfbe269a17105db8701a371d010da610
2024-07-19stack::sdp::sdpu_build_n_send_error Use proper param tSDP_STATUS Chris Manton
Bug: 354042766 Test: m . Flag: EXEMPT, Proper Data Type Change-Id: Ibb9ac6c48dcd746f29022c5e568596c2ca012d78
2024-07-19Merge "InitFlags: Remove unused includes" into main Myles Watson
2024-07-18InitFlags: Remove unused includes Myles Watson
Bug: 252902891 Test: mma -j32 Flag: EXEMPT, no logical change Change-Id: Ic67310fb798e3380089598ee96f20a03fc56d417
2024-07-18Merge "InitFlags: Remove dynamic_avrcp_version_enhancement" into main Myles Watson
2024-07-18Merge changes Iaaaaa015,Ie057371e into main Myles Watson
* changes: InitFlags: Remove sdp_skip_rnr_if_known InitFlags: Remove sdp_serialization
2024-07-18Merge "InitFlags: Remove pbap_pse_dynamic_attributes" into main Myles Watson
2024-07-18stack::sdp Unify LOG_TAG token Chris Manton
Bug: 353606076 Test: m . Flag: EXEMPT, Logging Infrastructure Change-Id: Ia99842af084255e05e3354e7a22953e370b079af
2024-07-16Merge "InitFlags: Remove hfp_dynamic_version" into main Myles Watson
2024-07-16InitFlags: Remove dynamic_avrcp_version_enhancement Myles Watson
Bug: 252902891 Fixes: 290844039 Test: mma -j32 Flag: EXEMPT, no logical change Change-Id: I6cad9fbffdbeaae5d08ef4bc4bba88aae37a553c
2024-07-16stack::sdp Use conventional structure definition Chris Manton
Remove the typedefs Bug: 352112759 Test: m . Flag: EXEMPT, Mechanical refactor Change-Id: Ief5b942fed9a0e9ee6b46927ae955eee6b2eb510
2024-07-16InitFlags: Remove sdp_serialization Myles Watson
Bug: 251328572 Fixes: 290846397 Test: mma -j32 Flag: EXEMPT, no logical change Change-Id: Ie057371ef91a1bdd9a1853cf9732811aff99c90f
2024-07-16Merge "dumpsys: Add stack::sdp dumpsys procedure" into main Treehugger Robot
2024-07-16InitFlags: Remove pbap_pse_dynamic_attributes Myles Watson
Bug: 252902891 Fixes: 290845736 Test: mma -j32 Flag: EXEMPT, no logical change Change-Id: Ibf3586b4fbfc7967efe35a72269aa68dc769dcc3
2024-07-16stack::sdp: Declare and assign tCONN_CB together Chris Manton
Bug: 352106391 Test: m . Flag: EXEMPT, Mechanical refactor Change-Id: I39b01a83d5b76f2ee5fc8d0edf9302c58591b214
2024-07-16dumpsys: Add stack::sdp dumpsys procedure Chris Manton
Bug: 328137809 Test: m . Flag: EXEMPT, Expanded logging Change-Id: Ib93e4be59af5d17364076b8c2d38ead5101cd574
2024-07-16InitFlags: Remove hfp_dynamic_version Myles Watson
Bug: 252902891 Fixes: 290845201 Test: mma -j32 Flag: EXEMPT, no logical change Change-Id: I67d2f7516bbd99fdbecc192e59be0ba28528908b
2024-07-15stack::sdp::SDP_GetDiRecord Use proper return type Chris Manton
Bug: 352845847 Test: m . Flag: EXEMPT, Proper Return Typing Change-Id: I95aeb08bc6e92a5f8c5643e03f6c98bb2f7f5d43
2024-07-15stack::sdp::tCONN_CB Use proper type tSDP_REASON::disconnect_reason Chris Manton
Bug: 352833268 Test: m . Flag: EXEMPT, Type Narrowing Change-Id: I85d4428dc59eb08fc3eae081c1f03c0688453613
2024-07-13stack::sdp::SDP_SetLocalDiRecord Use proper return tSDP_STATUS Chris Manton
Bug: 352926289 Test: m . Flag: EXEMPT, Data type narrowing Change-Id: I57bc003c342f786e734d919e37c5916f8788b283