فهرست منبع

Bluetooth: Permit BT_SECURITY also for L2CAP raw sockets

Userspace pairing code can be simplified if it doesn't have to fall
back to using L2CAP_LM in the case of L2CAP raw sockets. This patch
allows the BT_SECURITY socket option to be used for these sockets.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Marcel Holtmann 16 سال پیش
والد
کامیت
2526d3d8b2
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      net/bluetooth/l2cap.c

+ 2 - 2
net/bluetooth/l2cap.c

@@ -1308,7 +1308,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
 
 
 	switch (optname) {
 	switch (optname) {
 	case BT_SECURITY:
 	case BT_SECURITY:
-		if (sk->sk_type != SOCK_SEQPACKET) {
+		if (sk->sk_type != SOCK_SEQPACKET && sk->sk_type != SOCK_RAW) {
 			err = -EINVAL;
 			err = -EINVAL;
 			break;
 			break;
 		}
 		}
@@ -1455,7 +1455,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, ch
 
 
 	switch (optname) {
 	switch (optname) {
 	case BT_SECURITY:
 	case BT_SECURITY:
-		if (sk->sk_type != SOCK_SEQPACKET) {
+		if (sk->sk_type != SOCK_SEQPACKET && sk->sk_type != SOCK_RAW) {
 			err = -EINVAL;
 			err = -EINVAL;
 			break;
 			break;
 		}
 		}