[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090519174740.GC2749@ami.dom.local>
Date: Tue, 19 May 2009 19:47:40 +0200
From: Jarek Poplawski <jarkao2@...il.com>
To: Neil Horman <nhorman@...driver.com>
Cc: Eric Dumazet <dada1@...mosbay.com>, lav@....ru,
Stephen Hemminger <shemminger@...ux-foundation.org>,
netdev@...r.kernel.org
Subject: Re: Fw: [Bug 13339] New: rtable leak in ipv4/route.c
On Tue, May 19, 2009 at 07:17:03PM +0200, Jarek Poplawski wrote:
> On Tue, May 19, 2009 at 12:23:30PM -0400, Neil Horman wrote:
...
> > Of course, it helps if I attach the patch :)
> >
> >
> > diff --git a/include/net/dst.h b/include/net/dst.h
> > index 6be3b08..a39db6d 100644
> > --- a/include/net/dst.h
> > +++ b/include/net/dst.h
> > @@ -47,6 +47,7 @@ struct dst_entry
> > #define DST_NOXFRM 2
> > #define DST_NOPOLICY 4
> > #define DST_NOHASH 8
> > +#define DST_GRPLDR 16
> > unsigned long expires;
> >
> > unsigned short header_len; /* more space at head required */
> > diff --git a/net/ipv4/route.c b/net/ipv4/route.c
> > index c4c60e9..0120f0e 100644
> > --- a/net/ipv4/route.c
> > +++ b/net/ipv4/route.c
> > @@ -610,6 +610,8 @@ static inline int ip_rt_proc_init(void)
> >
> > static inline void rt_free(struct rtable *rt)
> > {
> > + if (rt->u.dst.flags & DST_GRPLDR)
> > + rt->u.dst.rt_next->u.dst.flag |= DST_GRPLDR;
> > call_rcu_bh(&rt->u.dst.rcu_head, dst_rcu_free);
> > }
> >
> > @@ -1143,8 +1145,11 @@ restart:
> > * relvant to the hash function together, which we use to adjust
> > * our chain length
> > */
> > - if (*rthp && compare_hash_inputs(&(*rthp)->fl, &rt->fl))
> > + if (!*rthi && *rthp &&
> > + compare_hash_inputs(&(*rthp)->fl, &rt->fl) &&
> > + (cand != rth))
> > rthi = rth;
>
> Does it really prevent cand == rthi in the next loop?
Hmm.. It looks OK yet!
Sorry,
Jarek P.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists