Netdev Archive on lore.kernel.org help / color / mirror / Atom feed
From: Karsten Graul <kgraul@linux.ibm.com> To: Wen Gu <guwen@linux.alibaba.com>, davem@davemloft.net, kuba@kernel.org Cc: linux-s390@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH net] net/smc: Avoid setting clcsock options after clcsock released Date: Tue, 11 Jan 2022 11:03:55 +0100 [thread overview] Message-ID: <ac977743-9696-9723-5682-97ebbcca6828@linux.ibm.com> (raw) In-Reply-To: <1641807505-54454-1-git-send-email-guwen@linux.alibaba.com> On 10/01/2022 10:38, Wen Gu wrote: > We encountered a crash in smc_setsockopt() and it is caused by > accessing smc->clcsock after clcsock was released. > > BUG: kernel NULL pointer dereference, address: 0000000000000020 > #PF: supervisor read access in kernel mode > #PF: error_code(0x0000) - not-present page > PGD 0 P4D 0 > Oops: 0000 [#1] PREEMPT SMP PTI > CPU: 1 PID: 50309 Comm: nginx Kdump: loaded Tainted: G E 5.16.0-rc4+ #53 > RIP: 0010:smc_setsockopt+0x59/0x280 [smc] > Call Trace: > <TASK> > __sys_setsockopt+0xfc/0x190 > __x64_sys_setsockopt+0x20/0x30 > do_syscall_64+0x34/0x90 > entry_SYSCALL_64_after_hwframe+0x44/0xae > RIP: 0033:0x7f16ba83918e > </TASK> > > This patch tries to fix it by holding clcsock_release_lock and > checking whether clcsock has already been released. In case that > a crash of the same reason happens in smc_getsockopt(), this patch > also checkes smc->clcsock in smc_getsockopt(). > > Signed-off-by: Wen Gu <guwen@linux.alibaba.com> > --- > net/smc/af_smc.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c > index 1c9289f..af423f4 100644 > --- a/net/smc/af_smc.c > +++ b/net/smc/af_smc.c > @@ -2441,6 +2441,11 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, > /* generic setsockopts reaching us here always apply to the > * CLC socket > */ > + mutex_lock(&smc->clcsock_release_lock); > + if (!smc->clcsock) { > + mutex_unlock(&smc->clcsock_release_lock); > + return -EBADF; > + } > if (unlikely(!smc->clcsock->ops->setsockopt)) > rc = -EOPNOTSUPP; > else > @@ -2450,6 +2455,7 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, > sk->sk_err = smc->clcsock->sk->sk_err; > sk_error_report(sk); > } > + mutex_unlock(&smc->clcsock_release_lock); In the switch() the function smc_switch_to_fallback() might be called which also accesses smc->clcsock without further checking. This should also be protected then? Also from all callers of smc_switch_to_fallback() ? There are more uses of smc->clcsock (e.g. smc_bind(), ...), so why does this problem happen in setsockopt() for you only? I suspect it depends on the test case. I wonder if it makes sense to check and protect smc->clcsock at all places in the code where it is used... as of now we had no such races like you encountered. But I see that in theory this problem could also happen in other code areas. > > if (optlen < sizeof(int)) > return -EINVAL; > @@ -2509,13 +2515,21 @@ static int smc_getsockopt(struct socket *sock, int level, int optname, > char __user *optval, int __user *optlen) > { > struct smc_sock *smc; > + int rc; > > smc = smc_sk(sock->sk); > + mutex_lock(&smc->clcsock_release_lock); > + if (!smc->clcsock) { > + mutex_unlock(&smc->clcsock_release_lock); > + return -EBADF; > + } > /* socket options apply to the CLC socket */ > if (unlikely(!smc->clcsock->ops->getsockopt)) > return -EOPNOTSUPP; > - return smc->clcsock->ops->getsockopt(smc->clcsock, level, optname, > + rc = smc->clcsock->ops->getsockopt(smc->clcsock, level, optname, > optval, optlen); > + mutex_unlock(&smc->clcsock_release_lock); > + return rc; > } > > static int smc_ioctl(struct socket *sock, unsigned int cmd, -- Karsten
next prev parent reply other threads:[~2022-01-11 10:04 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-10 9:38 [PATCH net] net/smc: Avoid setting clcsock options after clcsock released Wen Gu 2022-01-11 10:03 ` Karsten Graul [this message] 2022-01-11 16:34 ` Wen Gu 2022-01-12 9:38 ` Karsten Graul 2022-01-13 8:23 ` Wen Gu 2022-01-13 15:15 ` Wen Gu 2022-01-11 18:14 ` Jakub Kicinski 2022-01-12 3:32 ` Wen Gu 2022-01-12 7:11 ` dust.li 2022-01-12 8:16 ` Wen Gu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=ac977743-9696-9723-5682-97ebbcca6828@linux.ibm.com \ --to=kgraul@linux.ibm.com \ --cc=davem@davemloft.net \ --cc=guwen@linux.alibaba.com \ --cc=kuba@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).