diff options
| author | David S. Miller <davem@davemloft.net> | 2021-09-21 10:54:17 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-09-21 10:54:17 +0100 |
| commit | 431db53c73c901aaf6239378c24e4823443b214c (patch) | |
| tree | 1d808134345a6f16a1cff315b913a36b0d3e13ee | |
| parent | 36747c96ed496f62dabd1dce9b0f0d5b58495b66 (diff) | |
| parent | a18cee4791b1123d0a6579a7c89f4b87e48abe03 (diff) | |
Merge branch 'smc-fixes'
Karsten Graul says:
====================
net/smc: fixes 2021-09-20
Please apply the following patches for smc to netdev's net tree.
The first patch adds a missing error check, and the second patch
fixes a possible leak of a lock in a worker.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/smc/smc_clc.c | 3 | ||||
| -rw-r--r-- | net/smc/smc_core.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c index e286dafd6e88..6ec1ebe878ae 100644 --- a/net/smc/smc_clc.c +++ b/net/smc/smc_clc.c @@ -230,7 +230,8 @@ static int smc_clc_prfx_set(struct socket *clcsock, goto out_rel; } /* get address to which the internal TCP socket is bound */ - kernel_getsockname(clcsock, (struct sockaddr *)&addrs); + if (kernel_getsockname(clcsock, (struct sockaddr *)&addrs) < 0) + goto out_rel; /* analyze IP specific data of net_device belonging to TCP socket */ addr6 = (struct sockaddr_in6 *)&addrs; rcu_read_lock(); diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c index af227b65669e..8280c938be80 100644 --- a/net/smc/smc_core.c +++ b/net/smc/smc_core.c @@ -1474,7 +1474,9 @@ static void smc_conn_abort_work(struct work_struct *work) abort_work); struct smc_sock *smc = container_of(conn, struct smc_sock, conn); + lock_sock(&smc->sk); smc_conn_kill(conn, true); + release_sock(&smc->sk); sock_put(&smc->sk); /* sock_hold done by schedulers of abort_work */ } |