| Message ID | 8ef55b45-8850-f811-b996-5a16ee4dd97f@i-love.sakura.ne.jp (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 938cca9e4109b30ee1d476904538225a825e54eb |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2] sock: fix /proc/net/sockstat underflow in sk_clone_lock() | expand |
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Mon, 15 Nov 2021 19:16:56 +0900 you wrote: > sk_clone_lock() needs to call sock_inuse_add(1) before entering the > sk_free_unlock_clone() error path, for __sk_free() from sk_free() from > sk_free_unlock_clone() calls sock_inuse_add(-1). > > Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> > Fixes: 648845ab7e200993 ("sock: Move the socket inuse to namespace.") > > [...] Here is the summary with links: - [v2] sock: fix /proc/net/sockstat underflow in sk_clone_lock() https://git.kernel.org/netdev/net/c/938cca9e4109 You are awesome, thank you!
diff --git a/net/core/sock.c b/net/core/sock.c index 8f2b2f2c0e7b..41e91d0f7061 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2124,8 +2124,10 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) newsk->sk_prot_creator = prot; /* SANITY */ - if (likely(newsk->sk_net_refcnt)) + if (likely(newsk->sk_net_refcnt)) { get_net(sock_net(newsk)); + sock_inuse_add(sock_net(newsk), 1); + } sk_node_init(&newsk->sk_node); sock_lock_init(newsk); bh_lock_sock(newsk); @@ -2197,8 +2199,6 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) newsk->sk_err_soft = 0; newsk->sk_priority = 0; newsk->sk_incoming_cpu = raw_smp_processor_id(); - if (likely(newsk->sk_net_refcnt)) - sock_inuse_add(sock_net(newsk), 1); /* Before updating sk_refcnt, we must commit prior changes to memory * (Documentation/RCU/rculist_nulls.rst for details)
sk_clone_lock() needs to call sock_inuse_add(1) before entering the sk_free_unlock_clone() error path, for __sk_free() from sk_free() from sk_free_unlock_clone() calls sock_inuse_add(-1). Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Fixes: 648845ab7e200993 ("sock: Move the socket inuse to namespace.") --- Changes in v2: Rewrite patch description. net/core/sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)