From: Stefano Garzarella <sgarzare@redhat.com>
To: Peilin Ye <yepeilin.cs@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Peilin Ye <peilin.ye@bytedance.com>,
George Zhang <georgezhang@vmware.com>,
Dmitry Torokhov <dtor@vmware.com>, Andy King <acking@vmware.com>,
virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net v2 1/2] vsock: Fix memory leak in vsock_connect()
Date: Mon, 8 Aug 2022 09:55:33 +0200 [thread overview]
Message-ID: <20220808075533.p7pczlnixb2phrun@sgarzare-redhat> (raw)
In-Reply-To: <a02c6e7e3135473d254ac97abc603d963ba8f716.1659862577.git.peilin.ye@bytedance.com>
On Sun, Aug 07, 2022 at 02:00:11AM -0700, Peilin Ye wrote:
>From: Peilin Ye <peilin.ye@bytedance.com>
>
>An O_NONBLOCK vsock_connect() request may try to reschedule
>@connect_work. Imagine the following sequence of vsock_connect()
>requests:
>
> 1. The 1st, non-blocking request schedules @connect_work, which will
> expire after 200 jiffies. Socket state is now SS_CONNECTING;
>
> 2. Later, the 2nd, blocking request gets interrupted by a signal after
> a few jiffies while waiting for the connection to be established.
> Socket state is back to SS_UNCONNECTED, but @connect_work is still
> pending, and will expire after 100 jiffies.
>
> 3. Now, the 3rd, non-blocking request tries to schedule @connect_work
> again. Since @connect_work is already scheduled,
> schedule_delayed_work() silently returns. sock_hold() is called
> twice, but sock_put() will only be called once in
> vsock_connect_timeout(), causing a memory leak reported by syzbot:
>
> BUG: memory leak
> unreferenced object 0xffff88810ea56a40 (size 1232):
> comm "syz-executor756", pid 3604, jiffies 4294947681 (age 12.350s)
> hex dump (first 32 bytes):
> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
> 28 00 07 40 00 00 00 00 00 00 00 00 00 00 00 00 (..@............
> backtrace:
> [<ffffffff837c830e>] sk_prot_alloc+0x3e/0x1b0 net/core/sock.c:1930
> [<ffffffff837cbe22>] sk_alloc+0x32/0x2e0 net/core/sock.c:1989
> [<ffffffff842ccf68>] __vsock_create.constprop.0+0x38/0x320 net/vmw_vsock/af_vsock.c:734
> [<ffffffff842ce8f1>] vsock_create+0xc1/0x2d0 net/vmw_vsock/af_vsock.c:2203
> [<ffffffff837c0cbb>] __sock_create+0x1ab/0x2b0 net/socket.c:1468
> [<ffffffff837c3acf>] sock_create net/socket.c:1519 [inline]
> [<ffffffff837c3acf>] __sys_socket+0x6f/0x140 net/socket.c:1561
> [<ffffffff837c3bba>] __do_sys_socket net/socket.c:1570 [inline]
> [<ffffffff837c3bba>] __se_sys_socket net/socket.c:1568 [inline]
> [<ffffffff837c3bba>] __x64_sys_socket+0x1a/0x20 net/socket.c:1568
> [<ffffffff84512815>] do_syscall_x64 arch/x86/entry/common.c:50 [inline]
> [<ffffffff84512815>] do_syscall_64+0x35/0x80 arch/x86/entry/common.c:80
> [<ffffffff84600068>] entry_SYSCALL_64_after_hwframe+0x44/0xae
> <...>
>
>Use mod_delayed_work() instead: if @connect_work is already scheduled,
>reschedule it, and undo sock_hold() to keep the reference count
>balanced.
>
>Reported-and-tested-by: syzbot+b03f55bf128f9a38f064@syzkaller.appspotmail.com
>Fixes: d021c344051a ("VSOCK: Introduce VM Sockets")
>Co-developed-by: Stefano Garzarella <sgarzare@redhat.com>
>Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
>Signed-off-by: Peilin Ye <peilin.ye@bytedance.com>
>---
>change since v1:
> - merged with Stefano's patch [1]
>
>[1] https://gitlab.com/sgarzarella/linux/-/commit/2d0f0b9cbbb30d58fdcbca7c1a857fd8f3110d61
>
>Hi Stefano,
>
>About the Fixes: tag, [2] introduced @connect_work, but all it did was
>breaking @dwork into two and moving some INIT_DELAYED_WORK()'s, so I don't
>think [2] introduced this memory leak?
>
>Since [2] has already been backported to 4.9 and 4.14, I think we can
>Fixes: commit d021c344051a ("VSOCK: Introduce VM Sockets"), too, to make
>backporting easier?
Yep, I think it should be fine!
>
>[2] commit 455f05ecd2b2 ("vsock: split dwork to avoid reinitializations")
>
>Thanks,
>Peilin Ye
>
> net/vmw_vsock/af_vsock.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
>index f04abf662ec6..fe14f6cbca22 100644
>--- a/net/vmw_vsock/af_vsock.c
>+++ b/net/vmw_vsock/af_vsock.c
>@@ -1391,7 +1391,13 @@ static int vsock_connect(struct socket *sock, struct sockaddr *addr,
> * timeout fires.
> */
> sock_hold(sk);
>- schedule_delayed_work(&vsk->connect_work, timeout);
>+
>+ /* If the timeout function is already scheduled,
>+ * reschedule it, then ungrab the socket refcount to
>+ * keep it balanced.
>+ */
>+ if (mod_delayed_work(system_wq, &vsk->connect_work, timeout))
^
Checkpatch warns here about line lenght.
If you have to re-send, please split it.
Anyway, the patch LGTM:
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Thanks,
Stefano
next prev parent reply other threads:[~2022-08-08 7:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-04 2:09 [PATCH RFC net-next] vsock: Reschedule connect_work for O_NONBLOCK connect() requests Peilin Ye
2022-08-04 6:59 ` Stefano Garzarella
2022-08-04 23:44 ` Peilin Ye
2022-08-05 12:42 ` Stefano Garzarella
2022-08-05 18:27 ` Peilin Ye
2022-08-07 9:00 ` [PATCH net v2 1/2] vsock: Fix memory leak in vsock_connect() Peilin Ye
2022-08-07 9:00 ` [PATCH net v2 2/2] vsock: Set socket state back to SS_UNCONNECTED in vsock_connect_timeout() Peilin Ye
2022-08-08 7:56 ` Stefano Garzarella
2022-08-08 7:55 ` Stefano Garzarella [this message]
2022-08-08 17:45 ` [PATCH net v2 1/2] vsock: Fix memory leak in vsock_connect() Peilin Ye
2022-08-08 18:04 ` [PATCH net v3 " Peilin Ye
2022-08-08 18:05 ` [PATCH net v3 2/2] vsock: Set socket state back to SS_UNCONNECTED in vsock_connect_timeout() Peilin Ye
2022-08-10 9:00 ` [PATCH net v3 1/2] vsock: Fix memory leak in vsock_connect() patchwork-bot+netdevbpf
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=20220808075533.p7pczlnixb2phrun@sgarzare-redhat \
--to=sgarzare@redhat.com \
--cc=acking@vmware.com \
--cc=davem@davemloft.net \
--cc=dtor@vmware.com \
--cc=edumazet@google.com \
--cc=georgezhang@vmware.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=peilin.ye@bytedance.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=yepeilin.cs@gmail.com \
/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).