[PATCH] rhashtable: fix rht_for_each_entry_safe() endless loop

[PATCH] rhashtable: fix rht_for_each_entry_safe() endless loop

[Patrick McHardy]

"next" is not updated, causing an endless loop for buckets with more than
one element.

Signed-off-by: Patrick McHardy <kaber@trash.net>
---
 include/linux/rhashtable.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h
index 9570832..83944f9 100644
--- a/include/linux/rhashtable.h
+++ b/include/linux/rhashtable.h
@@ -260,7 +260,9 @@ void rhashtable_destroy(struct rhashtable *ht);
 	     next = !rht_is_a_nulls(pos) ?				    \
 		       rht_dereference_bucket(pos->next, tbl, hash) : NULL; \
 	     (!rht_is_a_nulls(pos)) && rht_entry(tpos, pos, member);	    \
-	     pos = next)
+	     pos = next,						    \
+	     next = !rht_is_a_nulls(pos) ?				    \
+		       rht_dereference_bucket(pos->next, tbl, hash) : NULL)
 
 /**
  * rht_for_each_rcu_continue - continue iterating over rcu hash chain
-- 
2.1.0

Re: [PATCH] rhashtable: fix rht_for_each_entry_safe() endless loop

[Thomas Graf]

On 01/21/15 at 11:12am, Patrick McHardy wrote:
> "next" is not updated, causing an endless loop for buckets with more than
> one element.
> 
> Signed-off-by: Patrick McHardy <kaber@trash.net>

Fixes: 88d6ed15acff ("rhashtable: Convert bucket iterators to take table and index")

Acked-by: Thomas Graf <tgraf@suug.ch>

Dave: This only affects net-next.

Re: [PATCH] rhashtable: fix rht_for_each_entry_safe() endless loop

[David Miller]

From: Patrick McHardy <kaber@trash.net>
Date: Wed, 21 Jan 2015 11:12:13 +0000

> "next" is not updated, causing an endless loop for buckets with more than
> one element.
> 
> Signed-off-by: Patrick McHardy <kaber@trash.net>

Applied, thanks Patrick.