From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sat, 25 Feb 2017 14:38:11 +0000 (+0800)
Subject: rhashtable: Fix use before NULL check in bucket_table_free
X-Git-Tag: v4.11-rc1~55^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca435407ba6655a0d63230818ffe7006d967dfe5;p=thirdparty%2Flinux.git

rhashtable: Fix use before NULL check in bucket_table_free

Dan Carpenter reported a use before NULL check bug in the function
bucket_table_free.  In fact we don't need the NULL check at all as
no caller can provide a NULL argument.  So this patch fixes this by
simply removing it.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 172454e6b979e..fac1a78afb391 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -146,9 +146,7 @@ static void bucket_table_free(const struct bucket_table *tbl)
 	if (tbl->nest)
 		nested_bucket_table_free(tbl);
 
-	if (tbl)
-		kvfree(tbl->locks);
-
+	kvfree(tbl->locks);
 	kvfree(tbl);
 }