aboutsummaryrefslogtreecommitdiffstats
path: root/net/netlink
diff options
context:
space:
mode:
authorLi RongQing <lirongqing@baidu.com>2018-09-11 09:05:01 +0800
committerDavid S. Miller <davem@davemloft.net>2018-09-12 00:08:44 -0700
commit0041195d55bc38df6b574cc8c36dcf2266fbee39 (patch)
tree1f0c49826312f1e69712e577309c6846b517e30b /net/netlink
parentscsi: libcxgbi: fib6_ino reference in rt6_info is rcu protected (diff)
downloadlinux-dev-0041195d55bc38df6b574cc8c36dcf2266fbee39.tar.xz
linux-dev-0041195d55bc38df6b574cc8c36dcf2266fbee39.zip
netlink: remove hash::nelems check in netlink_insert
The type of hash::nelems has been changed from size_t to atom_t which in fact is int, so not need to check if BITS_PER_LONG, that is bit number of size_t, is bigger than 32 and rht_grow_above_max() will be called to check if hashtable is too big, ensure it can not bigger than 1<<31 Signed-off-by: Zhang Yu <zhangyu31@baidu.com> Signed-off-by: Li RongQing <lirongqing@baidu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
-rw-r--r--net/netlink/af_netlink.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index b4a29bcc33b9..e3a0538ec0be 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -574,11 +574,6 @@ static int netlink_insert(struct sock *sk, u32 portid)
if (nlk_sk(sk)->bound)
goto err;
- err = -ENOMEM;
- if (BITS_PER_LONG > 32 &&
- unlikely(atomic_read(&table->hash.nelems) >= UINT_MAX))
- goto err;
-
nlk_sk(sk)->portid = portid;
sock_hold(sk);