From: bernard pidoux <f6bvp@free.fr>
To: Linux netdev <netdev@vger.kernel.org>,
Linux Hams <linux-hams@vger.kernel.org>,
David Miller <davem@davemloft.net>
Subject: [PATCH 3/3] [NETROM] zero length frame filtering in NetRom
Date: Thu, 19 Mar 2009 19:18:52 +0100 [thread overview]
Message-ID: <1237486732.30285.18.camel@f6bvp-11> (raw)
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: Bernard Pidoux <f6bvp@amsat.org>
---
net/netrom/af_netrom.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index e9c05b8..ec6c898 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1037,6 +1037,10 @@ static int nr_sendmsg(struct kiocb *iocb, struct socket *sock,
unsigned char *asmptr;
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))
return -EINVAL;
@@ -1167,6 +1171,11 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock,
skb_reset_transport_header(skb);
copied = skb->len;
+ /* NetRom empty data frame has no meaning : ignore it */
+ if (copied == 0) {
+ goto out;
+ }
+
if (copied > size) {
copied = size;
msg->msg_flags |= MSG_TRUNC;
@@ -1182,7 +1191,7 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock,
msg->msg_namelen = sizeof(*sax);
- skb_free_datagram(sk, skb);
+out: skb_free_datagram(sk, skb);
release_sock(sk);
return copied;
--
1.6.0.6
next reply other threads:[~2009-03-19 18:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-19 18:18 bernard pidoux [this message]
2009-03-21 20:34 ` [PATCH 3/3] [NETROM] zero length frame filtering in NetRom David Miller
2009-08-11 10:23 ` swapper Not tainted 2.6.29.6 Bernard Pidoux F6BVP
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1237486732.30285.18.camel@f6bvp-11 \
--to=f6bvp@free.fr \
--cc=davem@davemloft.net \
--cc=linux-hams@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).