iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ax25: zero length frame filtering in AX25

Browse Source 
In previous commit 244f46ae6e
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>
This commit is contained in:
Bernard Pidoux 2009-03-21 13:33:55 -07:00 committed by David S. Miller
parent 60784427ab
commit f99bcff7a2
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/ax25/af_ax25.c
View File

@ -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;
@ -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;