netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phil Oester <kernel@linuxace.com>
To: Patrick McHardy <kaber@trash.net>
Cc: Pavel Emelyanov <xemul@openvz.org>, netdev@vger.kernel.org
Subject: Re: 2.6.25-rc: Null dereference in ip_defrag
Date: Thu, 20 Mar 2008 08:30:17 -0700	[thread overview]
Message-ID: <20080320153017.GA2106@linuxace.com> (raw)
In-Reply-To: <47E2790A.9040206@trash.net>

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

On Thu, Mar 20, 2008 at 03:47:38PM +0100, Patrick McHardy wrote:
> >And it has survived 1.5 days without issue.  Patrick - will you be pushing
> >to David?
> 
> Could you send the patch you've been using?

Sure - attached below against current git.  I assume you will add your
signoff, but you can add

Tested-by: Phil Oester <kernel@linuxace.com>

Phil



[-- Attachment #2: patch-ipfrags --]
[-- Type: text/plain, Size: 480 bytes --]

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index a2e92f9..3b2e5ad 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -568,7 +568,7 @@ int ip_defrag(struct sk_buff *skb, u32 user)
 
 	IP_INC_STATS_BH(IPSTATS_MIB_REASMREQDS);
 
-	net = skb->dev->nd_net;
+	net = skb->dev ? skb->dev->nd_net : skb->dst->dev->nd_net;
 	/* Start by cleaning up the memory. */
 	if (atomic_read(&net->ipv4.frags.mem) > net->ipv4.frags.high_thresh)
 		ip_evictor(net);

  reply	other threads:[~2008-03-20 15:30 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-17 17:00 2.6.25-rc: Null dereference in ip_defrag Phil Oester
2008-03-17 17:40 ` Pavel Emelyanov
2008-03-17 17:43   ` Patrick McHardy
2008-03-17 17:57     ` Denis V. Lunev
2008-03-17 17:51       ` Patrick McHardy
2008-03-17 19:40     ` Phil Oester
2008-03-18  7:53       ` Pavel Emelyanov
2008-03-18  9:51         ` Pavel Emelyanov
2008-03-20  0:39           ` Phil Oester
2008-03-20 14:47             ` Patrick McHardy
2008-03-20 15:30               ` Phil Oester [this message]
2008-03-20 15:33                 ` Patrick McHardy

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=20080320153017.GA2106@linuxace.com \
    --to=kernel@linuxace.com \
    --cc=kaber@trash.net \
    --cc=netdev@vger.kernel.org \
    --cc=xemul@openvz.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).