Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5eee33a authored by Brian Delwiche's avatar Brian Delwiche
Browse files

Drop connection when atttempting to disable encryption 

Pixel devices in the field appear not to drop the connection or
reestablish encryption after receiving a command to disable link
layer encryption on an encrypted link, a certification
requirement.  Add a check forcing connections to drop in this case.

Bug: 251436534
Test: atest: bluetooth, lab validation forthcoming
Tag: #security
Ignore-AOSP-First: Security
Change-Id: Ie9d69be65fa1163c1ee10ca19153e98e737743cb
parent 76f73824

system/stack/acl/btm_acl.cc

+15 −0
Original line number Diff line number Diff line
@@ -636,6 +636,21 @@ void btm_acl_encrypt_change(uint16_t handle, uint8_t status, 
    return;

  }



  /* if we are trying to drop encryption on an encrypted connection, drop the

   * connection */

  if (p->is_encrypted && !encr_enable) {

    android_errorWriteLog(0x534e4554, "251436534");

    LOG(ERROR) << __func__

               << " attempting to decrypt encrypted connection, disconnecting. "

                  "handle: "

               << loghex(handle);



    acl_disconnect_from_handle(handle, HCI_ERR_HOST_REJECT_SECURITY,

                               "stack::btu::btu_hcif::read_drop_encryption "

                               "Connection Already Encrypted");

    return;

  }



  p->is_encrypted = encr_enable;



  /* Process Role Switch if active */