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

Commit d58daf42 authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: Preparation for usage of SOL_BLUETOOTH 



The socket option levels SOL_L2CAP, SOL_RFOMM and SOL_SCO are currently
in use by various Bluetooth applications. Going forward the common
option level SOL_BLUETOOTH should be used. This patch prepares the clean
split of the old and new option levels while keeping everything backward
compatibility.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 91aa35a5

net/bluetooth/l2cap.c

+49 −2
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms 
	return err;

}



static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen)

static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __user *optval, int optlen)

{

	struct sock *sk = sock->sk;

	struct l2cap_options opts;
@@ -1152,7 +1152,29 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch 
	return err;

}



static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)

static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen)

{

	struct sock *sk = sock->sk;

	int err = 0;



	BT_DBG("sk %p", sk);



	if (level == SOL_L2CAP)

		return l2cap_sock_setsockopt_old(sock, optname, optval, optlen);



	lock_sock(sk);



	switch (optname) {

	default:

		err = -ENOPROTOOPT;

		break;

	}



	release_sock(sk);

	return err;

}



static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __user *optval, int __user *optlen)

{

	struct sock *sk = sock->sk;

	struct l2cap_options opts;
@@ -1208,6 +1230,31 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, ch 
	return err;

}



static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)

{

	struct sock *sk = sock->sk;

	int len, err = 0;



	BT_DBG("sk %p", sk);



	if (level == SOL_L2CAP)

		return l2cap_sock_getsockopt_old(sock, optname, optval, optlen);



	if (get_user(len, optlen))

		return -EFAULT;



	lock_sock(sk);



	switch (optname) {

	default:

		err = -ENOPROTOOPT;

		break;

	}



	release_sock(sk);

	return err;

}



static int l2cap_sock_shutdown(struct socket *sock, int how)

{

	struct sock *sk = sock->sk;

net/bluetooth/rfcomm/sock.c

+49 −2
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ static int rfcomm_sock_recvmsg(struct kiocb *iocb, struct socket *sock, 
	return copied ? : err;

}



static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen)

static int rfcomm_sock_setsockopt_old(struct socket *sock, int optname, char __user *optval, int optlen)

{

	struct sock *sk = sock->sk;

	int err = 0;
@@ -742,7 +742,29 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c 
	return err;

}



static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)

static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen)

{

	struct sock *sk = sock->sk;

	int err = 0;



	BT_DBG("sk %p", sk);



	if (level == SOL_RFCOMM)

		return rfcomm_sock_setsockopt_old(sock, optname, optval, optlen);



	lock_sock(sk);



	switch (optname) {

	default:

		err = -ENOPROTOOPT;

		break;

	}



	release_sock(sk);

	return err;

}



static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __user *optval, int __user *optlen)

{

	struct sock *sk = sock->sk;

	struct sock *l2cap_sk;
@@ -788,6 +810,31 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c 
	return err;

}



static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)

{

	struct sock *sk = sock->sk;

	int len, err = 0;



	BT_DBG("sk %p", sk);



	if (level == SOL_RFCOMM)

		return rfcomm_sock_getsockopt_old(sock, optname, optval, optlen);



	if (get_user(len, optlen))

		return -EFAULT;



	lock_sock(sk);



	switch (optname) {

	default:

		err = -ENOPROTOOPT;

		break;

	}



	release_sock(sk);

	return err;

}



static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)

{

	struct sock *sk __maybe_unused = sock->sk;

net/bluetooth/sco.c

+26 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char 
	return err;

}



static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)

static int sco_sock_getsockopt_old(struct socket *sock, int optname, char __user *optval, int __user *optlen)

{

	struct sock *sk = sock->sk;

	struct sco_options opts;
@@ -723,6 +723,31 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char 
	return err;

}



static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)

{

	struct sock *sk = sock->sk;

	int len, err = 0;



	BT_DBG("sk %p", sk);



	if (level == SOL_SCO)

		return sco_sock_getsockopt_old(sock, optname, optval, optlen);



	if (get_user(len, optlen))

		return -EFAULT;



	lock_sock(sk);



	switch (optname) {

	default:

		err = -ENOPROTOOPT;

		break;

	}



	release_sock(sk);

	return err;

}



static int sco_sock_release(struct socket *sock)

{

	struct sock *sk = sock->sk;