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

Commit cc29c70d authored by Jean Delvare's avatar Jean Delvare Committed by David S. Miller
Browse files

net/netrom: Fix socket locking 



Patch "af_rose/x25: Sanity check the maximum user frame size"
(commit 83e0bbcb) from Alan Cox got
locking wrong. If we bail out due to user frame size being too large,
we must unlock the socket beforehand.

Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 50b2ff1b

net/netrom/af_netrom.c

+4 −2
Original line number Diff line number Diff line
@@ -1084,8 +1084,10 @@ static int nr_sendmsg(struct kiocb *iocb, struct socket *sock, 


	/* Build a packet - the conventional user limit is 236 bytes. We can

	   do ludicrously large NetROM frames but must not overflow */

	if (len > 65536)

		return -EMSGSIZE;

	if (len > 65536) {

		err = -EMSGSIZE;

		goto out;

	}



	SOCK_DEBUG(sk, "NET/ROM: sendto: building packet.\n");

	size = len + NR_NETWORK_LEN + NR_TRANSPORT_LEN;