diff options
| author | Kirill Tkhai <ktkhai@virtuozzo.com> | 2018-01-12 16:28:31 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-15 20:23:42 +0100 |
| commit | 273c28bc57ca9672f7b70bed764ecdfb964930c8 (patch) | |
| tree | 99fda63f67f8e081924a6d39af93dfbbb04e6eff /net/ipv4/inet_timewait_sock.c | |
| parent | sctp: removed unused var from sctp_make_auth (diff) | |
| download | linux-273c28bc57ca9672f7b70bed764ecdfb964930c8.tar.xz linux-273c28bc57ca9672f7b70bed764ecdfb964930c8.zip | |
net: Convert atomic_t net::count to refcount_t
Since net could be obtained from RCU lists,
and there is a race with net destruction,
the patch converts net::count to refcount_t.
This provides sanity checks for the cases of
incrementing counter of already dead net,
when maybe_get_net() has to used instead
of get_net().
Drivers: allyesconfig and allmodconfig are OK.
Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_timewait_sock.c')
| -rw-r--r-- | net/ipv4/inet_timewait_sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c index 277ff69a312d..c3ea4906d237 100644 --- a/net/ipv4/inet_timewait_sock.c +++ b/net/ipv4/inet_timewait_sock.c @@ -270,14 +270,14 @@ restart: continue; tw = inet_twsk(sk); if ((tw->tw_family != family) || - atomic_read(&twsk_net(tw)->count)) + refcount_read(&twsk_net(tw)->count)) continue; if (unlikely(!refcount_inc_not_zero(&tw->tw_refcnt))) continue; if (unlikely((tw->tw_family != family) || - atomic_read(&twsk_net(tw)->count))) { + refcount_read(&twsk_net(tw)->count))) { inet_twsk_put(tw); goto restart; } |