From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: bin.lan.cn@windriver.com, Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 5.15.y] Bluetooth: hci_event: Align BR/EDR JUST_WORKS paring with LE
Date: Tue, 25 Mar 2025 07:33:35 -0400 [thread overview]
Message-ID: <20250324233344-967a425cf23be182@stable.kernel.org> (raw)
In-Reply-To: <20250324074129.1066447-1-bin.lan.cn@windriver.com>
[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected.
No action required from the submitter.
The upstream commit SHA1 provided is correct: b25e11f978b63cb7857890edb3a698599cddb10e
WARNING: Author mismatch between patch and upstream commit:
Backport author: bin.lan.cn@windriver.com
Commit author: Luiz Augusto von Dentz<luiz.von.dentz@intel.com>
Status in newer kernel trees:
6.13.y | Present (exact SHA1)
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: 830c03e58beb)
6.1.y | Present (different SHA1: d17c631ba04e)
Note: The patch differs from the upstream commit:
---
1: b25e11f978b63 ! 1: 5094cffc5d0c1 Bluetooth: hci_event: Align BR/EDR JUST_WORKS paring with LE
@@ Metadata
## Commit message ##
Bluetooth: hci_event: Align BR/EDR JUST_WORKS paring with LE
+ [ Upstream commit b25e11f978b63cb7857890edb3a698599cddb10e ]
+
This aligned BR/EDR JUST_WORKS method with LE which since 92516cd97fd4
("Bluetooth: Always request for user confirmation for Just Works")
always request user confirmation with confirm_hint set since the
@@ Commit message
Fixes: ba15a58b179e ("Bluetooth: Fix SSP acceptor just-works confirmation without MITM")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Tested-by: Kiran K <kiran.k@intel.com>
+ Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
+ Signed-off-by: He Zhe <zhe.he@windriver.com>
## net/bluetooth/hci_event.c ##
-@@ net/bluetooth/hci_event.c: static void hci_user_confirm_request_evt(struct hci_dev *hdev, void *data,
+@@ net/bluetooth/hci_event.c: static void hci_user_confirm_request_evt(struct hci_dev *hdev,
goto unlock;
}
@@ net/bluetooth/hci_event.c: static void hci_user_confirm_request_evt(struct hci_d
- conn->io_capability != HCI_IO_NO_INPUT_OUTPUT &&
- (loc_mitm || rem_mitm)) {
+ conn->io_capability != HCI_IO_NO_INPUT_OUTPUT) {
- bt_dev_dbg(hdev, "Confirming auto-accept as acceptor");
+ BT_DBG("Confirming auto-accept as acceptor");
confirm_hint = 1;
goto confirm;
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.15.y | Success | Success |
prev parent reply other threads:[~2025-03-25 11:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-24 7:41 [PATCH 5.15.y] Bluetooth: hci_event: Align BR/EDR JUST_WORKS paring with LE bin.lan.cn
2025-03-25 11:33 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250324233344-967a425cf23be182@stable.kernel.org \
--to=sashal@kernel.org \
--cc=bin.lan.cn@windriver.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox