From: Eric Dumazet <eric.dumazet@gmail.com>
To: Tom Parkin <tparkin@katalix.com>
Cc: David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Subject: Re: [RFC PATCH] udp: don't rereference dst_entry dev pointer on rcv
Date: Thu, 11 Apr 2013 09:32:41 -0700 [thread overview]
Message-ID: <1365697961.3887.176.camel@edumazet-glaptop> (raw)
In-Reply-To: <1363274946.29475.24.camel@edumazet-glaptop>
On Thu, 2013-03-14 at 16:29 +0100, Eric Dumazet wrote:
> On Thu, 2013-03-14 at 16:05 +0100, Eric Dumazet wrote:
> > On Thu, 2013-03-14 at 14:45 +0000, Tom Parkin wrote:
> > > On Thu, Mar 14, 2013 at 02:18:04AM +0100, Eric Dumazet wrote:
> > > > Ah thanks for this, as this definitely makes more sense ;)
> > > >
> > > > Could you try the following fix ?
> > > >
> > > > diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
> > > > index b6d30ac..87f4ecb 100644
> > > > --- a/net/ipv4/ip_fragment.c
> > > > +++ b/net/ipv4/ip_fragment.c
> > > > @@ -529,6 +529,7 @@ found:
> > > > qp->q.meat == qp->q.len)
> > > > return ip_frag_reasm(qp, prev, dev);
> > > >
> > > > + skb_dst_force(skb);
> > > > inet_frag_lru_move(&qp->q);
> > > > return -EINPROGRESS;
> > > >
> > >
> > > Thanks Eric, with this patch I can no longer reproduce the oops :-)
> >
> > Thanks for testing.
> >
> > I am considering an alternative patch :
> >
> > We can drop the reference instead, and use the dst of the last skb.
> >
> > This would help to not dirty the dst refcount.
> >
> > I'll send an updated version.
> >
>
> OK, I tested the following one instead, please test it so that I can send an official patch.
>
> Thanks
>
> diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
> index b6d30ac..2d23830 100644
> --- a/net/ipv4/ip_fragment.c
> +++ b/net/ipv4/ip_fragment.c
> @@ -529,6 +529,7 @@ found:
> qp->q.meat == qp->q.len)
> return ip_frag_reasm(qp, prev, dev);
>
> + skb_dst_drop(skb);
> inet_frag_lru_move(&qp->q);
> return -EINPROGRESS;
>
>
Short update : I do not understand yet why this patch is not working.
Normally, the reassembled packet should get the dst from the last skb
(the one completing the packet)...
I have to make more experiments.
next prev parent reply other threads:[~2013-04-11 16:32 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-07 22:36 [RFC PATCH] prevent oops in udp rcv path Tom Parkin
2013-03-07 22:36 ` [RFC PATCH] udp: don't rereference dst_entry dev pointer on rcv Tom Parkin
2013-03-07 22:47 ` Eric Dumazet
2013-03-07 23:15 ` David Miller
2013-03-13 23:27 ` Tom Parkin
2013-03-14 1:18 ` Eric Dumazet
2013-03-14 14:45 ` Tom Parkin
2013-03-14 15:05 ` Eric Dumazet
2013-03-14 15:29 ` Eric Dumazet
2013-03-14 16:14 ` Tom Parkin
2013-03-23 10:31 ` Damien Wyart
2013-03-23 15:09 ` Eric Dumazet
2013-04-11 16:32 ` Eric Dumazet [this message]
2013-04-11 17:53 ` Eric Dumazet
2013-04-11 22:26 ` Eric Dumazet
2013-04-12 22:32 ` David Miller
2013-04-12 7:04 ` Tom Parkin
2013-04-16 20:20 ` Tom Parkin
2013-04-16 22:55 ` [PATCH] net: drop dst before queueing fragments Eric Dumazet
2013-04-17 5:15 ` David Miller
2013-04-16 22:56 ` [RFC PATCH] udp: don't rereference dst_entry dev pointer on rcv Eric Dumazet
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=1365697961.3887.176.camel@edumazet-glaptop \
--to=eric.dumazet@gmail.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=tparkin@katalix.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