diff options
| author | Brian Delwiche <delwiche@google.com> | 2023-06-01 23:57:58 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-17 19:38:20 +0000 |
| commit | 7efaca679b4706b26698abd702bd68cdaf5e65c8 (patch) | |
| tree | 764691d77f448d7f0c975b220b8e5056e6c7ad4e | |
| parent | 1df48d6d9b6df5bef6d09ccf79823ebcc29f4b44 (diff) | |
| download | bt-7efaca679b4706b26698abd702bd68cdaf5e65c8.tar.gz | |
Fix UAF in gatt_cl.cc
gatt_cl.cc accesses a header field after the buffer holding it may have
been freed.
Track the relevant state as a local variable instead.
Bug: 274617156
Test: atest: bluetooth, validated against fuzzer
Tag: #security
Ignore-AOSP-First: Security
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d7a7f7f3311202065de4b2c17b49994053dd1244)
Merged-In: I085ecfa1a9ba098ecbfecbd3cb3e263ae13f9724
Change-Id: I085ecfa1a9ba098ecbfecbd3cb3e263ae13f9724
| -rw-r--r-- | stack/gatt/gatt_cl.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/stack/gatt/gatt_cl.cc b/stack/gatt/gatt_cl.cc index 4e7899568..9ea5bafd6 100644 --- a/stack/gatt/gatt_cl.cc +++ b/stack/gatt/gatt_cl.cc @@ -601,12 +601,17 @@ void gatt_process_prep_write_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, memcpy(value.value, p, value.len); + bool subtype_is_write_prepare = (p_clcb->op_subtype == GATT_WRITE_PREPARE); + if (!gatt_check_write_long_terminate(tcb, p_clcb, &value)) { gatt_send_prepare_write(tcb, p_clcb); return; } - if (p_clcb->op_subtype == GATT_WRITE_PREPARE) { + // We now know that we have not terminated, or else we would have returned + // early. We free the buffer only if the subtype is not equal to + // GATT_WRITE_PREPARE, so checking here is adequate to prevent UAF. + if (subtype_is_write_prepare) { /* application should verify handle offset and value are matched or not */ gatt_end_operation(p_clcb, p_clcb->status, &value); |