* [Bluez PATCH v3] bluetooth: fix passkey uninitialized when used
@ 2020-02-20 3:17 Howard Chung
2020-02-20 7:33 ` Marcel Holtmann
0 siblings, 1 reply; 2+ messages in thread
From: Howard Chung @ 2020-02-20 3:17 UTC (permalink / raw)
To: linux-bluetooth, marcel
Cc: chromeos-bluetooth-upstreaming, Howard Chung, kbuild test robot,
David S. Miller, Johan Hedberg, netdev, linux-kernel,
Jakub Kicinski, clang-built-linux
This patch fix the issue: warning:variable 'passkey' is uninitialized
when used here
Link: https://groups.google.com/forum/#!topic/clang-built-linux/kyRKCjRsGoU
Reported-by: kbuild test robot <lkp@intel.com>
Suggested-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Howard Chung <howardchung@google.com>
---
Changes in v3:
- rephrase the commit message
Changes in v2:
- refactor code
net/bluetooth/smp.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 50e0ac692ec4..929e0bebaf80 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -2115,7 +2115,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
struct l2cap_chan *chan = conn->smp;
struct smp_chan *smp = chan->data;
struct hci_conn *hcon = conn->hcon;
- u8 *pkax, *pkbx, *na, *nb;
+ u8 *pkax, *pkbx, *na, *nb, confirm_hint;
u32 passkey;
int err;
@@ -2179,13 +2179,12 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
*/
if (hci_find_ltk(hcon->hdev, &hcon->dst, hcon->dst_type,
hcon->role)) {
- err = mgmt_user_confirm_request(hcon->hdev, &hcon->dst,
- hcon->type,
- hcon->dst_type,
- passkey, 1);
- if (err)
- return SMP_UNSPECIFIED;
- set_bit(SMP_FLAG_WAIT_USER, &smp->flags);
+ /* Set passkey to 0. The value can be any number since
+ * it'll be ignored anyway.
+ */
+ passkey = 0;
+ confirm_hint = 1;
+ goto confirm;
}
}
@@ -2206,9 +2205,11 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
err = smp_g2(smp->tfm_cmac, pkax, pkbx, na, nb, &passkey);
if (err)
return SMP_UNSPECIFIED;
+ confirm_hint = 0;
+confirm:
err = mgmt_user_confirm_request(hcon->hdev, &hcon->dst, hcon->type,
- hcon->dst_type, passkey, 0);
+ hcon->dst_type, passkey, confirm_hint);
if (err)
return SMP_UNSPECIFIED;
--
2.25.0.265.gbab2e86ba0-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Bluez PATCH v3] bluetooth: fix passkey uninitialized when used
2020-02-20 3:17 [Bluez PATCH v3] bluetooth: fix passkey uninitialized when used Howard Chung
@ 2020-02-20 7:33 ` Marcel Holtmann
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Holtmann @ 2020-02-20 7:33 UTC (permalink / raw)
To: Howard Chung
Cc: Bluez mailing list, ChromeOS Bluetooth Upstreaming,
kbuild test robot, David S. Miller, Johan Hedberg, netdev, LKML,
Jakub Kicinski, clang-built-linux
Hi Howard,
> This patch fix the issue: warning:variable 'passkey' is uninitialized
> when used here
>
> Link: https://groups.google.com/forum/#!topic/clang-built-linux/kyRKCjRsGoU
>
> Reported-by: kbuild test robot <lkp@intel.com>
>
> Suggested-by: Marcel Holtmann <marcel@holtmann.org>
>
> Signed-off-by: Howard Chung <howardchung@google.com>
>
> ---
>
> Changes in v3:
> - rephrase the commit message
>
> Changes in v2:
> - refactor code
>
> net/bluetooth/smp.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-20 7:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-20 3:17 [Bluez PATCH v3] bluetooth: fix passkey uninitialized when used Howard Chung
2020-02-20 7:33 ` Marcel Holtmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).