From: Stefano Garzarella <sgarzare@redhat.com>
To: kuba@kernel.org, davem@davemloft.net
Cc: netdev@vger.kernel.org, Jorgen Hansen <jhansen@vmware.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
Andy King <acking@vmware.com>, Wei Liu <wei.liu@kernel.org>,
Dmitry Torokhov <dtor@vmware.com>,
"K. Y. Srinivasan" <kys@microsoft.com>,
George Zhang <georgezhang@vmware.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org
Subject: Re: [PATCH net] vsock: fix locking in vsock_shutdown()
Date: Mon, 8 Feb 2021 16:04:31 +0100 [thread overview]
Message-ID: <20210208150431.jtgeyyf5qackl62b@steredhat> (raw)
In-Reply-To: <20210208144307.83628-1-sgarzare@redhat.com>
On Mon, Feb 08, 2021 at 03:43:07PM +0100, Stefano Garzarella wrote:
>In vsock_shutdown() we touched some socket fields without holding the
>socket lock, such as 'state' and 'sk_flags'.
>
>Also, after the introduction of multi-transport, we are accessing
>'vsk->transport' in vsock_send_shutdown() without holding the lock
>and this call can be made while the connection is in progress, so
>the transport can change in the meantime.
>
>To avoid issues, we hold the socket lock when we enter in
>vsock_shutdown() and release it when we leave.
>
>Among the transports that implement the 'shutdown' callback, only
>hyperv_transport acquired the lock. Since the caller now holds it,
>we no longer take it.
>
>Fixes: d021c344051a ("VSOCK: Introduce VM Sockets")
>Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
>---
> net/vmw_vsock/af_vsock.c | 8 +++++---
> net/vmw_vsock/hyperv_transport.c | 2 --
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
>index 4ea301fc2bf0..5546710d8ac1 100644
>--- a/net/vmw_vsock/af_vsock.c
>+++ b/net/vmw_vsock/af_vsock.c
>@@ -943,10 +943,12 @@ static int vsock_shutdown(struct socket *sock, int mode)
> */
>
> sk = sock->sk;
>+
>+ lock_sock(sk);
> if (sock->state == SS_UNCONNECTED) {
> err = -ENOTCONN;
> if (sk->sk_type == SOCK_STREAM)
>- return err;
>+ goto out;
> } else {
> sock->state = SS_DISCONNECTING;
> err = 0;
>@@ -955,10 +957,8 @@ static int vsock_shutdown(struct socket *sock, int mode)
> /* Receive and send shutdowns are treated alike. */
> mode = mode & (RCV_SHUTDOWN | SEND_SHUTDOWN);
> if (mode) {
>- lock_sock(sk);
> sk->sk_shutdown |= mode;
> sk->sk_state_change(sk);
>- release_sock(sk);
>
> if (sk->sk_type == SOCK_STREAM) {
> sock_reset_flag(sk, SOCK_DONE);
>@@ -966,6 +966,8 @@ static int vsock_shutdown(struct socket *sock, int mode)
> }
> }
>
>+out:
>+ release_sock(sk);
> return err;
> }
>
>diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
>index 630b851f8150..5a3beef73461 100644
>--- a/net/vmw_vsock/hyperv_transport.c
>+++ b/net/vmw_vsock/hyperv_transport.c
>@@ -479,9 +479,7 @@ static int hvs_shutdown(struct vsock_sock *vsk, int mode)
> if (!(mode & SEND_SHUTDOWN))
> return 0;
>
>- lock_sock(sk);
> hvs_shutdown_lock_held(vsk->trans, mode);
>- release_sock(sk);
Ooops, removing these lines, 'sk' is not used anymore in hvs_shutdown(),
I'll send v2 ASAP:
../net/vmw_vsock/hyperv_transport.c: In function ‘hvs_shutdown’:
../net/vmw_vsock/hyperv_transport.c:477:15: warning: unused variable ‘sk’ [-Wunused-variable]
477 | struct sock *sk = sk_vsock(vsk);
| ^~
Since I'm here, I had a doubt whether to separate this modification or
leave it in this patch.
What do you suggest?
I did it this way because by modifying only the caller, we would have a
nested lock.
This way instead we are sure that if we backport this patch, we don't
forget to touch hvs_shutdown() as well.
Thanks,
Stefano
next prev parent reply other threads:[~2021-02-08 15:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 14:43 [PATCH net] vsock: fix locking in vsock_shutdown() Stefano Garzarella
2021-02-08 15:04 ` Stefano Garzarella [this message]
2021-02-08 19:12 ` Jakub Kicinski
2021-02-09 8:34 ` Stefano Garzarella
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=20210208150431.jtgeyyf5qackl62b@steredhat \
--to=sgarzare@redhat.com \
--cc=acking@vmware.com \
--cc=davem@davemloft.net \
--cc=dtor@vmware.com \
--cc=georgezhang@vmware.com \
--cc=haiyangz@microsoft.com \
--cc=jhansen@vmware.com \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sthemmin@microsoft.com \
--cc=wei.liu@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: link
Be 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).