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

Commit 22ef2de0 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Security: Send LinkKey reply without std::move am: 7b46c6c1 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1479127

Change-Id: I977bf338d4fa5503c9226a2f61545eda7ee44f3d
parents 1d4ccc1b 7b46c6c1

system/gd/security/pairing/classic_pairing_handler.cc

+4 −5
Original line number Diff line number Diff line
@@ -150,16 +150,15 @@ void ClassicPairingHandler::OnReceive(hci::LinkKeyRequestView packet) { 
  LOG_INFO("Received: %s", hci::EventCodeText(packet.GetEventCode()).c_str());

  ASSERT_LOG(GetRecord()->GetPseudoAddress()->GetAddress() == packet.GetBdAddr(), "Address mismatch");

  if (GetRecord()->IsPaired()) {

    auto packet = hci::LinkKeyRequestReplyBuilder::Create(

        GetRecord()->GetPseudoAddress()->GetAddress(), GetRecord()->GetLinkKey());

    LOG_INFO("Sending: LINK_KEY_REQUEST_REPLY");

    this->GetChannel()->SendCommand(std::move(packet));

    this->GetChannel()->SendCommand(hci::LinkKeyRequestReplyBuilder::Create(

        GetRecord()->GetPseudoAddress()->GetAddress(), GetRecord()->GetLinkKey()));

    last_status_ = hci::ErrorCode::SUCCESS;

    Cancel();

  } else {

    auto packet = hci::LinkKeyRequestNegativeReplyBuilder::Create(GetRecord()->GetPseudoAddress()->GetAddress());

    LOG_INFO("Sending: LINK_KEY_REQUEST_NEGATIVE_REPLY");

    this->GetChannel()->SendCommand(std::move(packet));

    this->GetChannel()->SendCommand(

        hci::LinkKeyRequestNegativeReplyBuilder::Create(GetRecord()->GetPseudoAddress()->GetAddress()));

  }

}