netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Graf <tgraf@suug.ch>
To: "David S. Miller" <davem@davemloft.net>
Cc: kuznet@ms2.inr.ac.ru, herbert@gondor.apana.org.au, netdev@oss.sgi.com
Subject: [PATCH] NET: Fix calculation for collapsed skb size
Date: Mon, 7 Feb 2005 15:27:42 +0100	[thread overview]
Message-ID: <20050207142742.GA31837@postel.suug.ch> (raw)
In-Reply-To: <20050206223239.5dc4e325.davem@davemloft.net>

patch also applies to 2.4 with some fuzz.

Noticed by Denis V. Lunev <den@asplinux.ru>

Signed-off-by: Thomas Graf <tgraf@suug.ch>

--- linux-2.6.11-rc3-bk3.orig/net/ipv4/tcp_input.c	2005-02-07 09:47:02.000000000 -0500
+++ linux-2.6.11-rc3-bk3/net/ipv4/tcp_input.c	2005-02-07 09:50:20.000000000 -0500
@@ -3760,8 +3760,7 @@
 	while (before(start, end)) {
 		struct sk_buff *nskb;
 		int header = skb_headroom(skb);
-		int copy = (PAGE_SIZE - sizeof(struct sk_buff) -
-			    sizeof(struct skb_shared_info) - header - 31)&~15;
+		int copy = SKB_MAX_ORDER(header, 0);
 
 		/* Too big header? This can happen with IPv6. */
 		if (copy < 0)

  parent reply	other threads:[~2005-02-07 14:27 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-01-28 23:03 [PATCH] NETLINK: Use SKB_MAXORDER to calculate NLMSG_GOODSIZE Thomas Graf
2005-01-28 23:22 ` Herbert Xu
2005-01-28 23:40   ` Thomas Graf
2005-02-07  6:27     ` David S. Miller
2005-01-28 23:48   ` Alexey Kuznetsov
2005-01-29  0:21     ` Thomas Graf
2005-01-29  0:27       ` Thomas Graf
2005-02-07  6:32         ` David S. Miller
2005-02-07 13:28           ` Thomas Graf
2005-02-07 14:27           ` Thomas Graf [this message]
2005-02-09  4:54             ` [PATCH] NET: Fix calculation for collapsed skb size David S. Miller
2005-01-29 18:40       ` [PATCH] NETLINK: Use SKB_MAXORDER to calculate NLMSG_GOODSIZE Alexey Kuznetsov
2005-01-29 12:47 ` Thomas Graf
2005-02-06 18:54 ` Thomas Graf
2005-02-06 21:08   ` David S. Miller
2005-02-07  6:25 ` 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=20050207142742.GA31837@postel.suug.ch \
    --to=tgraf@suug.ch \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=kuznet@ms2.inr.ac.ru \
    --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).