OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
84cb3df
)
Bluetooth: Allow setting BT_SECURITY_FIPS with setsockopt
author
Patrik Flykt
<patrik.flykt@linux.intel.com>
Thu, 24 Mar 2016 14:04:15 +0000
(16:04 +0200)
committer
Marcel Holtmann
<marcel@holtmann.org>
Fri, 8 Apr 2016 17:10:57 +0000
(19:10 +0200)
Update the security level check to allow setting BT_SECURITY_FIPS for
an L2CAP socket.
Signed-off-by: Patrik Flykt <patrik.flykt@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/l2cap_sock.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/l2cap_sock.c
b/net/bluetooth/l2cap_sock.c
index
e4cae72
..
388ee8b
100644
(file)
--- a/
net/bluetooth/l2cap_sock.c
+++ b/
net/bluetooth/l2cap_sock.c
@@
-778,7
+778,7
@@
static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
}
if (sec.level < BT_SECURITY_LOW ||
- sec.level > BT_SECURITY_
HIGH
) {
+ sec.level > BT_SECURITY_
FIPS
) {
err = -EINVAL;
break;
}