OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: nf_conntrack: checking for IS_ERR() instead of NULL
[uclinux-h8/linux.git]
/
net
/
bluetooth
/
smp.c
diff --git
a/net/bluetooth/smp.c
b/net/bluetooth/smp.c
index
3d0f7d2
..
ad82324
100644
(file)
--- a/
net/bluetooth/smp.c
+++ b/
net/bluetooth/smp.c
@@
-2312,6
+2312,10
@@
int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)
return 1;
chan = conn->smp;
return 1;
chan = conn->smp;
+ if (!chan) {
+ BT_ERR("SMP security requested but not available");
+ return 1;
+ }
if (!hci_dev_test_flag(hcon->hdev, HCI_LE_ENABLED))
return 1;
if (!hci_dev_test_flag(hcon->hdev, HCI_LE_ENABLED))
return 1;