summaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorCong Wang <xiyou.wangcong@gmail.com>2018-08-23 16:19:44 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-15 09:45:25 +0200
commit8fed734df37511ecfb522adb7dfe8541de362349 (patch)
treefd9d6f3d4490721f92c5ab5bcacfd96de0d420bd /net/tipc
parent417b068a6a7a42073d72480e1d5722dbe01e878e (diff)
downloadlinux-stable-8fed734df37511ecfb522adb7dfe8541de362349.tar.gz
linux-stable-8fed734df37511ecfb522adb7dfe8541de362349.tar.bz2
linux-stable-8fed734df37511ecfb522adb7dfe8541de362349.zip
tipc: fix a missing rhashtable_walk_exit()
[ Upstream commit bd583fe30427500a2d0abe25724025b1cb5e2636 ] rhashtable_walk_exit() must be paired with rhashtable_walk_enter(). Fixes: 40f9f4397060 ("tipc: Fix tipc_sk_reinit race conditions") Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: Ying Xue <ying.xue@windriver.com> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/socket.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 98a44ecb11e7..0aebf0695ae0 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -2268,6 +2268,8 @@ void tipc_sk_reinit(struct net *net)
walk_stop:
rhashtable_walk_stop(&iter);
} while (tsk == ERR_PTR(-EAGAIN));
+
+ rhashtable_walk_exit(&iter);
}
static struct tipc_sock *tipc_sk_lookup(struct net *net, u32 portid)