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

Commit a3ac80a1 authored by Bernard Pidoux's avatar Bernard Pidoux Committed by David S. Miller
Browse files

netrom: zero length frame filtering in NetRom 



A zero length frame filter was recently introduced in ROSE protocole.
Previous commit makes the same at AX25 protocole level.
This patch has the same purpose for NetRom  protocole.
The reason is that empty frames have no meaning in NetRom protocole.

Signed-off-by: default avatarBernard Pidoux <f6bvp@amsat.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f99bcff7

net/netrom/af_netrom.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -1037,6 +1037,10 @@ static int nr_sendmsg(struct kiocb *iocb, struct socket *sock, 
	unsigned char *asmptr;

	unsigned char *asmptr;

	int size;

	int size;





	/* Netrom empty data frame has no meaning : don't send */

	if (len == 0)

		return 0;



	if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_CMSG_COMPAT))

	if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_CMSG_COMPAT))

		return -EINVAL;

		return -EINVAL;
@@ -1167,6 +1171,11 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock, 
	skb_reset_transport_header(skb);

	skb_reset_transport_header(skb);

	copied     = skb->len;

	copied     = skb->len;





	/* NetRom empty data frame has no meaning : ignore it */

	if (copied == 0) {

		goto out;

	}



	if (copied > size) {

	if (copied > size) {

		copied = size;

		copied = size;

		msg->msg_flags |= MSG_TRUNC;

		msg->msg_flags |= MSG_TRUNC;
@@ -1182,7 +1191,7 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock, 




	msg->msg_namelen = sizeof(*sax);

	msg->msg_namelen = sizeof(*sax);





	skb_free_datagram(sk, skb);

out:	skb_free_datagram(sk, skb);





	release_sock(sk);

	release_sock(sk);

	return copied;

	return copied;