Skip to content

Commit

Permalink
ax25: zero length frame filtering in AX25
Browse files Browse the repository at this point in the history
In previous commit 244f46a
was introduced a zero length frame filter for ROSE protocole.
This patch has the same purpose at AX25 frame level for the same
reason. Empty frames have no meaning in AX25 protocole.

Signed-off-by: Bernard Pidoux <f6bvp@amsat.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Bernard Pidoux authored and David S. Miller committed Mar 21, 2009
1 parent 6078442 commit f99bcff
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions net/ax25/af_ax25.c
Original file line number Diff line number Diff line change
Expand Up @@ -1435,6 +1435,11 @@ static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock,
size_t size;
int lv, err, addr_len = msg->msg_namelen;

/* AX.25 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))
return -EINVAL;

Expand Down Expand Up @@ -1634,6 +1639,13 @@ static int ax25_recvmsg(struct kiocb *iocb, struct socket *sock,
skb_reset_transport_header(skb);
copied = skb->len;

/* AX.25 empty data frame has no meaning : ignore it */
if (copied == 0) {
err = copied;
skb_free_datagram(sk, skb);
goto out;
}

if (copied > size) {
copied = size;
msg->msg_flags |= MSG_TRUNC;
Expand Down

0 comments on commit f99bcff

Please sign in to comment.