linux-kernel - Re: [PATCH] rhashtable: fix for resize events during table walk

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20150706135230.GC15324@orbit.nwl.cc>
Date:	Mon, 6 Jul 2015 15:52:30 +0200
From:	Phil Sutter <phil@....cc>
To:	Herbert Xu <herbert@...dor.apana.org.au>
Cc:	Thomas Graf <tgraf@...g.ch>, sparclinux@...r.kernel.org,
	linux-kernel@...r.kernel.org, netdev@...r.kernel.org,
	davem@...emloft.net, daniel@...earbox.net, geert@...ux-m68k.org,
	mroos@...ux.ee
Subject: Re: [PATCH] rhashtable: fix for resize events during table walk

On Mon, Jul 06, 2015 at 09:30:40PM +0800, Herbert Xu wrote:
> On Mon, Jul 06, 2015 at 02:01:42PM +0200, Phil Sutter wrote:
> > diff --git a/lib/rhashtable.c b/lib/rhashtable.c
> > index a60a6d3..e36b94b 100644
> > --- a/lib/rhashtable.c
> > +++ b/lib/rhashtable.c
> > @@ -585,6 +585,7 @@ void *rhashtable_walk_next(struct rhashtable_iter *iter)
> >  	struct bucket_table *tbl = iter->walker->tbl;
> >  	struct rhashtable *ht = iter->ht;
> >  	struct rhash_head *p = iter->p;
> > +	void *rc = NULL;
> >  
> >  	if (p) {
> >  		p = rht_dereference_bucket_rcu(p->next, tbl, iter->slot);
> > @@ -617,12 +618,12 @@ next:
> >  	if (iter->walker->tbl) {
> >  		iter->slot = 0;
> >  		iter->skip = 0;
> > -		return ERR_PTR(-EAGAIN);
> > +		rc = ERR_PTR(-EAGAIN);
> >  	}
> >  
> >  	iter->p = NULL;
> 
> I think a simpler fix would be to move "iter->p = NULL" before
> the if statement.

Done. Thanks for the review!

Cheers, Phil
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/