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

Commit 6fd4777a authored by David S. Miller's avatar David S. Miller
Browse files

Revert "rose: zero length frame filtering in af_rose.c" 



This reverts commit 244f46ae.

Alan Cox did the research, and just like the other radio protocols
zero-length frames have meaning because at the top level ROSE is
X.25 PLP.

So this zero-length filtering is invalid.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 239795ad

net/rose/af_rose.c

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

	int n, size, qbit = 0;



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

	if (len == 0)

		return 0;



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

		return -EINVAL;
@@ -1273,12 +1269,6 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock, 
	skb_reset_transport_header(skb);

	copied     = skb->len;



	/* ROSE empty frame has no meaning : ignore it */

	if (copied == 0) {

		skb_free_datagram(sk, skb);

		return copied;

	}



	if (copied > size) {

		copied = size;

		msg->msg_flags |= MSG_TRUNC;