Unverified Commit 64295601 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8789 Bluetooth: SCO: Fix not validating setsockopt user input 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tong Tiangen <tongtiangen@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DP6ZUUVOIV667BY4IC6AOTATUNZE2M5J/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9QRB2 
 
Link:https://gitee.com/openeuler/kernel/pulls/8789

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 68f5ad9b 24898dd0

include/net/bluetooth/bluetooth.h

+9 −0
Original line number Diff line number Diff line
@@ -487,6 +487,15 @@ static inline struct sk_buff *bt_skb_sendmmsg(struct sock *sk, 
	return skb;

}



static inline int bt_copy_from_sockptr(void *dst, size_t dst_size,

				       sockptr_t src, size_t src_size)

{

	if (dst_size > src_size)

		return -EINVAL;



	return copy_from_sockptr(dst, src, dst_size);

}



int bt_to_errno(u16 code);



void hci_sock_set_flag(struct sock *sk, int nr);

net/bluetooth/sco.c

+8 −11
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, 
			       sockptr_t optval, unsigned int optlen)

{

	struct sock *sk = sock->sk;

	int len, err = 0;

	int err = 0;

	struct bt_voice voice;

	u32 opt;
@@ -845,10 +845,9 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, 
			break;

		}



		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {

			err = -EFAULT;

		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);

		if (err)

			break;

		}



		if (opt)

			set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
@@ -865,11 +864,10 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, 


		voice.setting = sco_pi(sk)->setting;



		len = min_t(unsigned int, sizeof(voice), optlen);

		if (copy_from_sockptr(&voice, optval, len)) {

			err = -EFAULT;

		err = bt_copy_from_sockptr(&voice, sizeof(voice), optval,

					   optlen);

		if (err)

			break;

		}



		/* Explicitly check for these values */

		if (voice.setting != BT_VOICE_TRANSPARENT &&
@@ -882,10 +880,9 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, 
		break;



	case BT_PKT_STATUS:

		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {

			err = -EFAULT;

		err = bt_copy_from_sockptr(&opt, sizeof(opt), optval, optlen);

		if (err)

			break;

		}



		if (opt)

			sco_pi(sk)->cmsg_mask |= SCO_CMSG_PKT_STATUS;