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

!7694 Bluetooth: af_bluetooth: Fix deadlock 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Huafei <lihuafei1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MMO7ULHLMIBZIVFPZJPX5UM5WLEL3UPY/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9HK0R 
 
Link:https://gitee.com/openeuler/kernel/pulls/7694

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents cf216944 61711948

net/bluetooth/af_bluetooth.c

+3 −7
Original line number Diff line number Diff line
@@ -263,14 +263,11 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, 
	if (flags & MSG_OOB)

		return -EOPNOTSUPP;



	lock_sock(sk);



	skb = skb_recv_datagram(sk, flags, noblock, &err);

	if (!skb) {

		if (sk->sk_shutdown & RCV_SHUTDOWN)

			err = 0;



		release_sock(sk);

		return err;

	}
@@ -293,8 +290,6 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, 


	skb_free_datagram(sk, skb);



	release_sock(sk);



	if (flags & MSG_TRUNC)

		copied = skblen;
@@ -519,10 +514,11 @@ int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
		if (sk->sk_state == BT_LISTEN)

			return -EINVAL;



		lock_sock(sk);

		spin_lock(&sk->sk_receive_queue.lock);

		skb = skb_peek(&sk->sk_receive_queue);

		amount = skb ? skb->len : 0;

		release_sock(sk);

		spin_unlock(&sk->sk_receive_queue.lock);



		err = put_user(amount, (int __user *) arg);

		break;