From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Graf Subject: [PATCH net-next] rhashtable: rhashtable_remove() must unlink in both tbl and future_tbl Date: Tue, 20 Jan 2015 16:58:26 +0000 Message-ID: <20150120165826.GK20315@casper.infradead.org> References: <54BCBA35.2080103@windriver.com> <20150119125928.GB7672@casper.infradead.org> <54BDC30D.5000606@windriver.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: "richard.alpe@ericsson.com >> Richard Alpe" , Netdev , tipc-discussion@lists.sourceforge.net To: davem@davemloft.net, Ying Xue Return-path: Received: from casper.infradead.org ([85.118.1.10]:60953 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752126AbbATQ6b (ORCPT ); Tue, 20 Jan 2015 11:58:31 -0500 Content-Disposition: inline In-Reply-To: <54BDC30D.5000606@windriver.com> Sender: netdev-owner@vger.kernel.org List-ID: As removals can occur during resizes, entries may be referred to from both tbl and future_tbl when the removal is requested. Therefore rhashtable_remove() must unlink the entry in both tables if this is the case. The existing code did search both tables but stopped when it hit the first match. Failing to do so resulted in use after remove. Fixes: 97defe1 ("rhashtable: Per bucket locks & deferred expansion/shrinking") Reported-by: Ying Xue Signed-off-by: Thomas Graf --- Ying: This should fix the panic that was at the end of your TIPC related boot log. I'm still working on the use after free. lib/rhashtable.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/rhashtable.c b/lib/rhashtable.c index a4449c4..b1aa10e 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -592,6 +592,7 @@ bool rhashtable_remove(struct rhashtable *ht, struct rhash_head *obj) struct rhash_head *he; spinlock_t *lock; unsigned int hash; + bool ret = false; rcu_read_lock(); tbl = rht_dereference_rcu(ht->tbl, ht); @@ -609,17 +610,16 @@ restart: } rcu_assign_pointer(*pprev, obj->next); - atomic_dec(&ht->nelems); - - spin_unlock_bh(lock); - - rhashtable_wakeup_worker(ht); - - rcu_read_unlock(); - return true; + ret = true; + break; } + /* The entry may be linked in either 'tbl', 'future_tbl', or both. + * 'future_tbl' only exists for a short period of time during + * resizing. Thus traversing both is fine and the added cost is + * very rare. + */ if (tbl != rht_dereference_rcu(ht->future_tbl, ht)) { spin_unlock_bh(lock); @@ -632,9 +632,15 @@ restart: } spin_unlock_bh(lock); + + if (ret) { + atomic_dec(&ht->nelems); + rhashtable_wakeup_worker(ht); + } + rcu_read_unlock(); - return false; + return ret; } EXPORT_SYMBOL_GPL(rhashtable_remove); -- 1.9.3