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

Commit 53446469 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: qrtr: Revert lock sock changes in qrtr_recvmsg"

parents a4558366 7a5463e1

net/qrtr/qrtr.c

+3 −7
Original line number Diff line number Diff line
@@ -1741,20 +1741,16 @@ static int qrtr_recvmsg(struct socket *sock, struct msghdr *msg, 
	struct qrtr_cb *cb;

	int copied, rc;



	lock_sock(sk);



	if (sock_flag(sk, SOCK_ZAPPED)) {

		release_sock(sk);

		pr_err("%s: Invalid addr error\n", __func__);

		return -EADDRNOTAVAIL;

	}

	skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT,

				flags & MSG_DONTWAIT, &rc);

	if (!skb) {

		release_sock(sk);

		pr_err("%s: Failed to get skb rc[%d]\n", __func__, rc);

	if (!skb)

		return rc;

	}



	lock_sock(sk);

	cb = (struct qrtr_cb *)skb->cb;



	copied = skb->len;