From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
To: netdev@vger.kernel.org
Cc: willemb@google.com, edumazet@google.com, davem@davemloft.net,
nbd@openwrt.org, sergei.shtylyov@cogentembedded.com,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Subject: [PATCH v3] packet: Allow packets with only a header (but no payload)
Date: Sun, 22 Nov 2015 17:46:09 +0100 [thread overview]
Message-ID: <1448210769-15289-1-git-send-email-martin.blumenstingl@googlemail.com> (raw)
In-Reply-To: <1448067012-15090-1-git-send-email-martin.blumenstingl@googlemail.com>
Commit 9c7077622dd91 ("packet: make packet_snd fail on len smaller
than l2 header") added validation for the packet size in packet_snd.
This change enforces that every packet needs a header (with at least
hard_header_len bytes) plus a payload with at least one byte. Before
this change the payload was optional.
This fixes PPPoE connections which do not have a "Service" or
"Host-Uniq" configured (which is violating the spec, but is still
widely used in real-world setups). Those are currently failing with the
following message: "pppd: packet size is too short (24 <= 24)"
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
v3: Fixed a whitespace error (detected by checkpatch.pl) and updated
the commit message to point to the original commit correctly.
Thanks to Sergei Shtylyov for reporting these.
v2: Simply change the existing logic in ll_header_truncated instead of
splitting it and having multiple checks.
include/linux/netdevice.h | 3 ++-
net/packet/af_packet.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 67bfac1..9a488ed 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1398,7 +1398,8 @@ enum netdev_priv_flags {
* @dma: DMA channel
* @mtu: Interface MTU value
* @type: Interface hardware type
- * @hard_header_len: Hardware header length
+ * @hard_header_len: Hardware header length, which means that this is the
+ * minimum size of a packet.
*
* @needed_headroom: Extra headroom the hardware may need, but not in all
* cases can this be guaranteed
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 1cf928f..992396a 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -2329,8 +2329,8 @@ static void tpacket_destruct_skb(struct sk_buff *skb)
static bool ll_header_truncated(const struct net_device *dev, int len)
{
/* net device doesn't like empty head */
- if (unlikely(len <= dev->hard_header_len)) {
- net_warn_ratelimited("%s: packet size is too short (%d <= %d)\n",
+ if (unlikely(len < dev->hard_header_len)) {
+ net_warn_ratelimited("%s: packet size is too short (%d < %d)\n",
current->comm, len, dev->hard_header_len);
return true;
}
--
2.6.2
next prev parent reply other threads:[~2015-11-22 16:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-21 16:14 [PATCH] packet: Allow packets with only a header (but no payload) Martin Blumenstingl
2015-07-21 16:28 ` Willem de Bruijn
2015-07-21 16:38 ` Martin Blumenstingl
2015-07-21 16:51 ` Willem de Bruijn
2015-07-27 22:35 ` Martin Blumenstingl
2015-07-29 6:05 ` Willem de Bruijn
2015-07-30 22:15 ` Martin Blumenstingl
2015-11-07 13:11 ` Felix Fietkau
2015-11-09 17:53 ` Willem de Bruijn
2015-11-09 19:02 ` Felix Fietkau
2015-11-21 0:50 ` Martin Blumenstingl
2015-11-21 21:32 ` Sergei Shtylyov
2015-11-22 16:46 ` Martin Blumenstingl [this message]
2015-11-30 3:18 ` [PATCH v3] " David Miller
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=1448210769-15289-1-git-send-email-martin.blumenstingl@googlemail.com \
--to=martin.blumenstingl@googlemail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=nbd@openwrt.org \
--cc=netdev@vger.kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=willemb@google.com \
/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).