Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2526d3d8 authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

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: default avatarJohan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 37e62f55

net/bluetooth/l2cap.c

+2 −2
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch 


	switch (optname) {

	case BT_SECURITY:

		if (sk->sk_type != SOCK_SEQPACKET) {

		if (sk->sk_type != SOCK_SEQPACKET && sk->sk_type != SOCK_RAW) {

			err = -EINVAL;

			break;

		}
@@ -1455,7 +1455,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, ch 


	switch (optname) {

	case BT_SECURITY:

		if (sk->sk_type != SOCK_SEQPACKET) {

		if (sk->sk_type != SOCK_SEQPACKET && sk->sk_type != SOCK_RAW) {

			err = -EINVAL;

			break;

		}