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

Commit 7a5463e1 authored by Sarannya S's avatar Sarannya S
Browse files

net: qrtr: Revert lock sock changes in qrtr_recvmsg 



lock_sock got wrongly added in qrtr_recvmsg as part of the
patch "net: qrtr: print error case for qrtr receive".
Reverting lock_sock and release_sock in qrtr_recvmsg.

Change-Id: I7f9639405a67e2201a848277145bac57c88f6567
Signed-off-by: default avatarSarannya S <sarannya@codeaurora.org>
parent d2dabf2b

net/qrtr/qrtr.c

+3 −6
Original line number Diff line number Diff line
@@ -1741,19 +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);

	if (!skb)

		return rc;

	}



	lock_sock(sk);

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



	copied = skb->len;