aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD. Wythe2023-11-03 14:07:40 +0800
committerGreg Kroah-Hartman2023-11-20 11:52:16 +0100
commitf4277cb5626ba5eb60e70d993be37798c14078ed (patch)
tree8269a9a3a51e572efc83718fdea224a0592800c1
parent2d563aa75226192c0abf97292c78ecff5296ed69 (diff)
net/smc: put sk reference if close work was canceled
[ Upstream commit aa96fbd6d78d9770323b21e2c92bd38821be8852 ] Note that we always hold a reference to sock when attempting to submit close_work. Therefore, if we have successfully canceled close_work from pending, we MUST release that reference to avoid potential leaks. Fixes: 42bfba9eaa33 ("net/smc: immediate termination for SMCD link groups") Signed-off-by: D. Wythe <alibuda@linux.alibaba.com> Reviewed-by: Dust Li <dust.li@linux.alibaba.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--net/smc/smc_close.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/smc/smc_close.c b/net/smc/smc_close.c
index 449ef454b53b..10219f55aad1 100644
--- a/net/smc/smc_close.c
+++ b/net/smc/smc_close.c
@@ -116,7 +116,8 @@ static void smc_close_cancel_work(struct smc_sock *smc)
struct sock *sk = &smc->sk;
release_sock(sk);
- cancel_work_sync(&smc->conn.close_work);
+ if (cancel_work_sync(&smc->conn.close_work))
+ sock_put(sk);
cancel_delayed_work_sync(&smc->conn.tx_work);
lock_sock(sk);
}