summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2015-03-13 10:52:14 +1100
committerPablo Neira Ayuso <pablo@netfilter.org>2015-03-13 12:03:00 +0100
commitd8bdff59cea141d2e5f7e98c1b11d3e0271640bd (patch)
tree7583f9e998d590a2e82bed495f9c59b08816b9ef /net
parent78146572b9cd20452da47951812f35b1ad4906be (diff)
downloadlinux-d8bdff59cea141d2e5f7e98c1b11d3e0271640bd.tar.gz
linux-d8bdff59cea141d2e5f7e98c1b11d3e0271640bd.tar.bz2
linux-d8bdff59cea141d2e5f7e98c1b11d3e0271640bd.zip
netfilter: Fix potential crash in nft_hash walker
When we get back an EAGAIN from rhashtable_walk_next we were treating it as a valid object which obviously doesn't work too well. Luckily this is hard to trigger so it seems nobody has run into it yet. This patch fixes it by redoing the next call when we get an EAGAIN. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nft_hash.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c
index c82df0a48fcd..37c15e674884 100644
--- a/net/netfilter/nft_hash.c
+++ b/net/netfilter/nft_hash.c
@@ -153,6 +153,8 @@ static void nft_hash_walk(const struct nft_ctx *ctx, const struct nft_set *set,
iter->err = err;
goto out;
}
+
+ continue;
}
if (iter->count < iter->skip)