projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ad9d24c
)
Bluetooth: SMP: Fix crash when receiving new connection when debug is enabled
author
Luiz Augusto von Dentz
<luiz.von.dentz@intel.com>
Mon, 14 Jun 2021 17:46:44 +0000
(10:46 -0700)
committer
Marcel Holtmann
<marcel@holtmann.org>
Mon, 14 Jun 2021 20:16:27 +0000
(22:16 +0200)
When receiving a new connection pchan->conn won't be initialized so the
code cannot use bt_dev_dbg as the pointer to hci_dev won't be
accessible.
Fixes:
2e1614f7d61e4
("Bluetooth: SMP: Convert BT_ERR/BT_DBG to bt_dev_err/bt_dev_dbg")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/smp.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/smp.c
b/net/bluetooth/smp.c
index
372e3b2
..
7dd51da
100644
(file)
--- a/
net/bluetooth/smp.c
+++ b/
net/bluetooth/smp.c
@@
-3229,7
+3229,7
@@
static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan)
{
struct l2cap_chan *chan;
-
bt_dev_dbg(pchan->conn->hcon->hdev,
"pchan %p", pchan);
+
BT_DBG(
"pchan %p", pchan);
chan = l2cap_chan_create();
if (!chan)
@@
-3250,7
+3250,7
@@
static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan)
*/
atomic_set(&chan->nesting, L2CAP_NESTING_SMP);
-
bt_dev_dbg(pchan->conn->hcon->hdev,
"created chan %p", chan);
+
BT_DBG(
"created chan %p", chan);
return chan;
}
@@
-3354,7
+3354,7
@@
static void smp_del_chan(struct l2cap_chan *chan)
{
struct smp_dev *smp;
-
bt_dev_dbg(chan->conn->hcon->hdev,
"chan %p", chan);
+
BT_DBG(
"chan %p", chan);
smp = chan->data;
if (smp) {