From nobody Sat Apr 11 20:22:29 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11D9CC64EC4 for ; Thu, 9 Mar 2023 20:29:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229895AbjCIU3K (ORCPT ); Thu, 9 Mar 2023 15:29:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbjCIU3G (ORCPT ); Thu, 9 Mar 2023 15:29:06 -0500 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CA4D65AE; Thu, 9 Mar 2023 12:29:03 -0800 (PST) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 80F165FD1B; Thu, 9 Mar 2023 23:29:01 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678393741; bh=qHtnZady8MO5P+SxKXbSQQ1axjJ6o1RkSBId0/l8vfY=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=BM1cE+z+UXNOGOh/Z25liYbmVfs1mS1SWXYiysOj9dV1n1Cvividvl/KhRAFROcOZ R5SxlhNRkIAJ95LLurt1Ssa0rzfwl/vXDns4VxeD3y6ycNwszqO0VFbvUCJOIyJF44 qjYVbYI8lRiJCwf5MDPvlBWArI4EPBN927KlTIn3dqh/9AVNywH1oEJMe6cwnQM5PM /ZT7NvFnF2vEugClgiuFVk+iwMKuety+FZ8D1EP+mMxoS1p1JI7pJwpw4wDk68BKKa GoeSdNqCa8Oi8KlymXD1Z/V+c8N2d48DF+gxUZTdyomLHNLMoXmtsbPgLGGlpInAAu iLBzuKCfO0jWw== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Thu, 9 Mar 2023 23:29:01 +0300 (MSK) Message-ID: <71a296ad-6619-c8e6-14a1-9423ac2e4841@sberdevices.ru> Date: Thu, 9 Mar 2023 23:26:00 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Content-Language: en-US In-Reply-To: <1804d100-1652-d463-8627-da93cb61144e@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [RFC PATCH v4 1/4] virtio/vsock: don't use skbuff state to account credit Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/03/09 18:14:00 #20929517 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 'skb->len' can vary when we partially read the data, this complicates the calculation of credit to be updated in 'virtio_transport_inc_rx_pkt()/ virtio_transport_dec_rx_pkt()'. Also in 'virtio_transport_dec_rx_pkt()' we were miscalculating the credit since 'skb->len' was redundant. For these reasons, let's replace the use of skbuff state to calculate new 'rx_bytes'/'fwd_cnt' values with explicit value as input argument. This makes code more simple, because it is not needed to change skbuff state before each call to update 'rx_bytes'/'fwd_cnt'. Fixes: 71dc9ec9ac7d ("virtio/vsock: replace virtio_vsock_pkt with sk_buff") Signed-off-by: Arseniy Krasnov Reviewed-by: Stefano Garzarella --- net/vmw_vsock/virtio_transport_common.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio= _transport_common.c index a1581c77cf84..618680fd9906 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -241,21 +241,18 @@ static int virtio_transport_send_pkt_info(struct vsoc= k_sock *vsk, } =20 static bool virtio_transport_inc_rx_pkt(struct virtio_vsock_sock *vvs, - struct sk_buff *skb) + u32 len) { - if (vvs->rx_bytes + skb->len > vvs->buf_alloc) + if (vvs->rx_bytes + len > vvs->buf_alloc) return false; =20 - vvs->rx_bytes +=3D skb->len; + vvs->rx_bytes +=3D len; return true; } =20 static void virtio_transport_dec_rx_pkt(struct virtio_vsock_sock *vvs, - struct sk_buff *skb) + u32 len) { - int len; - - len =3D skb_headroom(skb) - sizeof(struct virtio_vsock_hdr) - skb->len; vvs->rx_bytes -=3D len; vvs->fwd_cnt +=3D len; } @@ -388,7 +385,9 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *v= sk, skb_pull(skb, bytes); =20 if (skb->len =3D=3D 0) { - virtio_transport_dec_rx_pkt(vvs, skb); + u32 pkt_len =3D le32_to_cpu(virtio_vsock_hdr(skb)->len); + + virtio_transport_dec_rx_pkt(vvs, pkt_len); consume_skb(skb); } else { __skb_queue_head(&vvs->rx_queue, skb); @@ -437,17 +436,17 @@ static int virtio_transport_seqpacket_do_dequeue(stru= ct vsock_sock *vsk, =20 while (!msg_ready) { struct virtio_vsock_hdr *hdr; + size_t pkt_len; =20 skb =3D __skb_dequeue(&vvs->rx_queue); if (!skb) break; hdr =3D virtio_vsock_hdr(skb); + pkt_len =3D (size_t)le32_to_cpu(hdr->len); =20 if (dequeued_len >=3D 0) { - size_t pkt_len; size_t bytes_to_copy; =20 - pkt_len =3D (size_t)le32_to_cpu(hdr->len); bytes_to_copy =3D min(user_buf_len, pkt_len); =20 if (bytes_to_copy) { @@ -484,7 +483,7 @@ static int virtio_transport_seqpacket_do_dequeue(struct= vsock_sock *vsk, msg->msg_flags |=3D MSG_EOR; } =20 - virtio_transport_dec_rx_pkt(vvs, skb); + virtio_transport_dec_rx_pkt(vvs, pkt_len); kfree_skb(skb); } =20 @@ -1040,7 +1039,7 @@ virtio_transport_recv_enqueue(struct vsock_sock *vsk, =20 spin_lock_bh(&vvs->rx_lock); =20 - can_enqueue =3D virtio_transport_inc_rx_pkt(vvs, skb); + can_enqueue =3D virtio_transport_inc_rx_pkt(vvs, len); if (!can_enqueue) { free_pkt =3D true; goto out; --=20 2.25.1 From nobody Sat Apr 11 20:22:29 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C0C5C61DA4 for ; Thu, 9 Mar 2023 20:30:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230511AbjCIUaP (ORCPT ); Thu, 9 Mar 2023 15:30:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230294AbjCIUaJ (ORCPT ); Thu, 9 Mar 2023 15:30:09 -0500 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 768A2F8665; Thu, 9 Mar 2023 12:30:05 -0800 (PST) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id C86765FD3A; Thu, 9 Mar 2023 23:30:03 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678393803; bh=7S+FEVatmyxfzv6iVztbucqvJz0EITDWICpCYpuxfvk=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=IsAp98zzR9YAzaB3tCd01ZJDaQF5BjfswpzyfTLDIJfApCQK2ojIMCcG9iZYWV8+h EsKsek2lywxioA6h5gidQqnfSyGNusHmr2nMt1zSUixdgkF4k1zrz/hzbcbZSdsmbu 1n091N7EkktU8FVZU7kcFzYPe3HVOILTbO8DKHbF5sZu+MKwAaMWfVjExKsKcCX53r 2Yvaf93Kqo8aYFPsqYRsb+9SnstdPf/cGlMZB/0jElgRhNrnuK1GRVjMz32LncoZL9 e/n0S/x6BpzgVhrmfS0moQIYmB8A3lbXzsqvWemzgS3OGgiDuyq/YDUHyMLcwp2tGD 2xmDzSXt62zVA== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Thu, 9 Mar 2023 23:30:03 +0300 (MSK) Message-ID: <6260a6cc-bd69-72a6-8aa5-34ff68764287@sberdevices.ru> Date: Thu, 9 Mar 2023 23:27:02 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Content-Language: en-US In-Reply-To: <1804d100-1652-d463-8627-da93cb61144e@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [RFC PATCH v4 2/4] virtio/vsock: remove redundant 'skb_pull()' call Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/03/09 18:14:00 #20929517 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since we now no longer use 'skb->len' to update credit, there is no sense to update skbuff state, because it is used only once after dequeue to copy data and then will be released. Fixes: 71dc9ec9ac7d ("virtio/vsock: replace virtio_vsock_pkt with sk_buff") Signed-off-by: Arseniy Krasnov Reviewed-by: Stefano Garzarella --- net/vmw_vsock/virtio_transport_common.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio= _transport_common.c index 618680fd9906..9a411475e201 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -465,7 +465,6 @@ static int virtio_transport_seqpacket_do_dequeue(struct= vsock_sock *vsk, dequeued_len =3D err; } else { user_buf_len -=3D bytes_to_copy; - skb_pull(skb, bytes_to_copy); } =20 spin_lock_bh(&vvs->rx_lock); --=20 2.25.1 From nobody Sat Apr 11 20:22:29 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6C3CC64EC4 for ; Thu, 9 Mar 2023 20:31:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229637AbjCIUbZ (ORCPT ); Thu, 9 Mar 2023 15:31:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230200AbjCIUbP (ORCPT ); Thu, 9 Mar 2023 15:31:15 -0500 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38097E7EDB; Thu, 9 Mar 2023 12:31:04 -0800 (PST) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 9AD935FD1B; Thu, 9 Mar 2023 23:31:02 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678393862; bh=hrrHq0NfzOnE5uXZKILc0Jws2vvk8qJw234H8bwXodk=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=YvfPj0e4oE+UIg9//74vqMtCIev3zaaowg2aczKnu/WuGmaJz5z7TT6QgLuKk7pqJ vFnA0QuL3lFoq846TRY3MIrPGtMkBxC6mcAwouCid69mNadd52GPX3ps1rIijsEmJU LCK0OKD2eJDgAuXz2MaHEshKd2hnm9QbwwPY8P9PoxZd6BOxm/2SZnRc4ZBEPwQZc3 TCaG8CxEwl388EdsdIPAzEoQjarReLoungeEvBIdWvPTRZQRaHlx1W0i885sk7ViyM 7Q4aew6TKDm/YXrAjypXdUUg5qXCN4tZsQFDgsYqf6PsNzZpNf0pKsAo9evMaimEia 5o0JKmnDhziIA== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Thu, 9 Mar 2023 23:31:02 +0300 (MSK) Message-ID: Date: Thu, 9 Mar 2023 23:28:01 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Content-Language: en-US In-Reply-To: <1804d100-1652-d463-8627-da93cb61144e@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [RFC PATCH v4 3/4] virtio/vsock: don't drop skbuff on copy failure Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/03/09 18:14:00 #20929517 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This returns behaviour of SOCK_STREAM read as before skbuff usage. When copying to user fails current skbuff won't be dropped, but returned to sockets's queue. Technically instead of 'skb_dequeue()', 'skb_peek()' is called and when skbuff becomes empty, it is removed from queue by '__skb_unlink()'. Fixes: 71dc9ec9ac7d ("virtio/vsock: replace virtio_vsock_pkt with sk_buff") Signed-off-by: Arseniy Krasnov Reviewed-by: Stefano Garzarella --- net/vmw_vsock/virtio_transport_common.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio= _transport_common.c index 9a411475e201..6564192e7f20 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -364,7 +364,7 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *v= sk, =20 spin_lock_bh(&vvs->rx_lock); while (total < len && !skb_queue_empty(&vvs->rx_queue)) { - skb =3D __skb_dequeue(&vvs->rx_queue); + skb =3D skb_peek(&vvs->rx_queue); =20 bytes =3D len - total; if (bytes > skb->len) @@ -388,9 +388,8 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *v= sk, u32 pkt_len =3D le32_to_cpu(virtio_vsock_hdr(skb)->len); =20 virtio_transport_dec_rx_pkt(vvs, pkt_len); + __skb_unlink(skb, &vvs->rx_queue); consume_skb(skb); - } else { - __skb_queue_head(&vvs->rx_queue, skb); } } =20 --=20 2.25.1 From nobody Sat Apr 11 20:22:29 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE79AC6FD19 for ; Thu, 9 Mar 2023 20:32:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230043AbjCIUce (ORCPT ); Thu, 9 Mar 2023 15:32:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbjCIUcb (ORCPT ); Thu, 9 Mar 2023 15:32:31 -0500 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AA0BF8662; Thu, 9 Mar 2023 12:32:29 -0800 (PST) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id EF88E5FD1B; Thu, 9 Mar 2023 23:32:27 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1678393948; bh=DzVarEVGLOGPMv/nEn7ynZtKJOLMh7bPhpvVeCziZKc=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=Kgbz3fWXoyBscpDzEfSS/We+NAPlK0tAD1rnGNlNzdcamRRbY0kSgyLjbPvsrfxK2 DnaAkPZ7cSnm+Yxg1MrVPZTmpyW+gXjlGnhOYYMIbc/cMoSJqEvN0Ew55Fm/uFTDa4 31O/HRGNS8XpekXO2Uc+9Bm5sEcj2iHilq6iHI1hfrkbmThpkUcLYbpHq+UnyEznC4 5xbanPeggE34pRadVBab3U+mmb7w+/kGkHKDvkjg0fjCv0QBqbUS2x3gQ/NY7gkt6L rO1XmBqM+XWkn2wRrbuVIdE7AqL6McROAL0CaflhIRu6i+Bip3I+etGjXKdRH77rvB HNUybPT0voYOQ== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Thu, 9 Mar 2023 23:32:27 +0300 (MSK) Message-ID: Date: Thu, 9 Mar 2023 23:29:26 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Content-Language: en-US In-Reply-To: <1804d100-1652-d463-8627-da93cb61144e@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [RFC PATCH v4 4/4] test/vsock: copy to user failure test Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/03/09 18:14:00 #20929517 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds SOCK_STREAM and SOCK_SEQPACKET tests for invalid buffer case. It tries to read data to NULL buffer (data already presents in socket's queue), then uses valid buffer. For SOCK_STREAM second read must return data, because skbuff is not dropped, but for SOCK_SEQPACKET skbuff will be dropped by kernel, and 'recv()' will return EAGAIN. Reviewed-by: Stefano Garzarella Signed-off-by: Arseniy Krasnov --- tools/testing/vsock/vsock_test.c | 118 +++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_t= est.c index 67e9f9df3a8c..3de10dbb50f5 100644 --- a/tools/testing/vsock/vsock_test.c +++ b/tools/testing/vsock/vsock_test.c @@ -860,6 +860,114 @@ static void test_stream_poll_rcvlowat_client(const st= ruct test_opts *opts) close(fd); } =20 +#define INV_BUF_TEST_DATA_LEN 512 + +static void test_inv_buf_client(const struct test_opts *opts, bool stream) +{ + unsigned char data[INV_BUF_TEST_DATA_LEN] =3D {0}; + ssize_t ret; + int fd; + + if (stream) + fd =3D vsock_stream_connect(opts->peer_cid, 1234); + else + fd =3D vsock_seqpacket_connect(opts->peer_cid, 1234); + + if (fd < 0) { + perror("connect"); + exit(EXIT_FAILURE); + } + + control_expectln("SENDDONE"); + + /* Use invalid buffer here. */ + ret =3D recv(fd, NULL, sizeof(data), 0); + if (ret !=3D -1) { + fprintf(stderr, "expected recv(2) failure, got %zi\n", ret); + exit(EXIT_FAILURE); + } + + if (errno !=3D ENOMEM) { + fprintf(stderr, "unexpected recv(2) errno %d\n", errno); + exit(EXIT_FAILURE); + } + + ret =3D recv(fd, data, sizeof(data), MSG_DONTWAIT); + + if (stream) { + /* For SOCK_STREAM we must continue reading. */ + if (ret !=3D sizeof(data)) { + fprintf(stderr, "expected recv(2) success, got %zi\n", ret); + exit(EXIT_FAILURE); + } + /* Don't check errno in case of success. */ + } else { + /* For SOCK_SEQPACKET socket's queue must be empty. */ + if (ret !=3D -1) { + fprintf(stderr, "expected recv(2) failure, got %zi\n", ret); + exit(EXIT_FAILURE); + } + + if (errno !=3D EAGAIN) { + fprintf(stderr, "unexpected recv(2) errno %d\n", errno); + exit(EXIT_FAILURE); + } + } + + control_writeln("DONE"); + + close(fd); +} + +static void test_inv_buf_server(const struct test_opts *opts, bool stream) +{ + unsigned char data[INV_BUF_TEST_DATA_LEN] =3D {0}; + ssize_t res; + int fd; + + if (stream) + fd =3D vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); + else + fd =3D vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL); + + if (fd < 0) { + perror("accept"); + exit(EXIT_FAILURE); + } + + res =3D send(fd, data, sizeof(data), 0); + if (res !=3D sizeof(data)) { + fprintf(stderr, "unexpected send(2) result %zi\n", res); + exit(EXIT_FAILURE); + } + + control_writeln("SENDDONE"); + + control_expectln("DONE"); + + close(fd); +} + +static void test_stream_inv_buf_client(const struct test_opts *opts) +{ + test_inv_buf_client(opts, true); +} + +static void test_stream_inv_buf_server(const struct test_opts *opts) +{ + test_inv_buf_server(opts, true); +} + +static void test_seqpacket_inv_buf_client(const struct test_opts *opts) +{ + test_inv_buf_client(opts, false); +} + +static void test_seqpacket_inv_buf_server(const struct test_opts *opts) +{ + test_inv_buf_server(opts, false); +} + static struct test_case test_cases[] =3D { { .name =3D "SOCK_STREAM connection reset", @@ -920,6 +1028,16 @@ static struct test_case test_cases[] =3D { .run_client =3D test_seqpacket_bigmsg_client, .run_server =3D test_seqpacket_bigmsg_server, }, + { + .name =3D "SOCK_STREAM test invalid buffer", + .run_client =3D test_stream_inv_buf_client, + .run_server =3D test_stream_inv_buf_server, + }, + { + .name =3D "SOCK_SEQPACKET test invalid buffer", + .run_client =3D test_seqpacket_inv_buf_client, + .run_server =3D test_seqpacket_inv_buf_server, + }, {}, }; =20 --=20 2.25.1