From: Stephen Hemminger <shemminger@osdl.org>
To: Jeff Garzik <jgarzik@pobox.com>, "David S. Miller" <davem@redhat.com>
Cc: netdev@oss.sgi.com
Subject: [RFT] syncppp needs to pullup headers
Date: Fri, 3 Oct 2003 11:43:47 -0700 [thread overview]
Message-ID: <20031003114347.31ee740b.shemminger@osdl.org> (raw)
In 2.6.0-test6 wan syncppp driver claims to be a "new" protocol and handle shared skb's
but it needs to make sure data is contiguous before overlaying headers.
It is not a serious problem because the sync drivers never generate nonlinear skbuff's
anyway.
Don't have hardware that uses this, so could someone please do a sanity
test on this.
diff -Nru a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
--- a/drivers/net/wan/syncppp.c Fri Oct 3 11:28:11 2003
+++ b/drivers/net/wan/syncppp.c Fri Oct 3 11:28:11 2003
@@ -236,7 +236,7 @@
sp->ipkts++;
}
- if (skb->len <= PPP_HEADER_LEN) {
+ if (!pskb_may_pull(skb, PPP_HEADER_LEN)) {
/* Too small packet, drop it. */
if (sp->pp_flags & PP_DEBUG)
printk (KERN_DEBUG "%s: input packet is too small, %d bytes\n",
@@ -473,7 +473,7 @@
u8 *p, opt[6];
u32 rmagic;
- if (len < 4) {
+ if (!pskb_may_pull(skb, sizeof(struct lcp_header))) {
if (sp->pp_flags & PP_DEBUG)
printk (KERN_WARNING "%s: invalid lcp packet length: %d bytes\n",
dev->name, len);
@@ -707,7 +707,9 @@
struct cisco_packet *h;
struct net_device *dev = sp->pp_if;
- if (skb->len != CISCO_PACKET_LEN && skb->len != CISCO_BIG_PACKET_LEN) {
+ if (!pskb_may_pull(skb, sizeof(struct cisco_packet))
+ || (skb->len != CISCO_PACKET_LEN
+ && skb->len != CISCO_BIG_PACKET_LEN)) {
if (sp->pp_flags & PP_DEBUG)
printk (KERN_WARNING "%s: invalid cisco packet length: %d bytes\n",
dev->name, skb->len);
@@ -1211,8 +1213,7 @@
struct net_device *dev = sp->pp_if;
int len = skb->len;
- if (len < 4)
- {
+ if (!pskb_may_pull(skb, sizeof(struct lcp_header))) {
if (sp->pp_flags & PP_DEBUG)
printk (KERN_WARNING "%s: invalid ipcp packet length: %d bytes\n",
dev->name, len);
next reply other threads:[~2003-10-03 18:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-10-03 18:43 Stephen Hemminger [this message]
2003-10-04 5:55 ` [RFT] syncppp needs to pullup headers David S. 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=20031003114347.31ee740b.shemminger@osdl.org \
--to=shemminger@osdl.org \
--cc=davem@redhat.com \
--cc=jgarzik@pobox.com \
--cc=netdev@oss.sgi.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).