From: Stefano Garzarella <sgarzare@redhat.com>
To: Arseniy Krasnov <avkrasnov@sberdevices.ru>
Cc: Stefan Hajnoczi <stefanha@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Bobby Eshleman <bobby.eshleman@bytedance.com>,
kvm@vger.kernel.org, virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel@sberdevices.ru, oxffffaa@gmail.com
Subject: Re: [RFC PATCH v3 4/4] test/vsock: copy to user failure test
Date: Thu, 9 Mar 2023 17:30:34 +0100 [thread overview]
Message-ID: <20230309163034.bznx6pywv5a45egw@sgarzare-redhat> (raw)
In-Reply-To: <5d726a68-8530-3e90-202c-ba21996db60f@sberdevices.ru>
On Thu, Mar 09, 2023 at 01:14:48PM +0300, Arseniy Krasnov wrote:
>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.
>
>Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
>---
> tools/testing/vsock/vsock_test.c | 118 +++++++++++++++++++++++++++++++
> 1 file changed, 118 insertions(+)
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
>
>diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.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 struct test_opts *opts)
> close(fd);
> }
>
>+#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] = {0};
>+ ssize_t ret;
>+ int fd;
>+
>+ if (stream)
>+ fd = vsock_stream_connect(opts->peer_cid, 1234);
>+ else
>+ fd = vsock_seqpacket_connect(opts->peer_cid, 1234);
>+
>+ if (fd < 0) {
>+ perror("connect");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ control_expectln("SENDDONE");
>+
>+ /* Use invalid buffer here. */
>+ ret = recv(fd, NULL, sizeof(data), 0);
>+ if (ret != -1) {
>+ fprintf(stderr, "expected recv(2) failure, got %zi\n", ret);
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ if (errno != ENOMEM) {
>+ fprintf(stderr, "unexpected recv(2) errno %d\n", errno);
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ ret = recv(fd, data, sizeof(data), MSG_DONTWAIT);
>+
>+ if (stream) {
>+ /* For SOCK_STREAM we must continue reading. */
>+ if (ret != 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 != -1) {
>+ fprintf(stderr, "expected recv(2) failure, got %zi\n", ret);
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ if (errno != 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] = {0};
>+ ssize_t res;
>+ int fd;
>+
>+ if (stream)
>+ fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL);
>+ else
>+ fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL);
>+
>+ if (fd < 0) {
>+ perror("accept");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ res = send(fd, data, sizeof(data), 0);
>+ if (res != 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[] = {
> {
> .name = "SOCK_STREAM connection reset",
>@@ -920,6 +1028,16 @@ static struct test_case test_cases[] = {
> .run_client = test_seqpacket_bigmsg_client,
> .run_server = test_seqpacket_bigmsg_server,
> },
>+ {
>+ .name = "SOCK_STREAM test invalid buffer",
>+ .run_client = test_stream_inv_buf_client,
>+ .run_server = test_stream_inv_buf_server,
>+ },
>+ {
>+ .name = "SOCK_SEQPACKET test invalid buffer",
>+ .run_client = test_seqpacket_inv_buf_client,
>+ .run_server = test_seqpacket_inv_buf_server,
>+ },
> {},
> };
>
>--
>2.25.1
>
next prev parent reply other threads:[~2023-03-09 16:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-09 10:10 [RFC PATCH v3 0/4] several updates to virtio/vsock Arseniy Krasnov
2023-03-09 10:11 ` [RFC PATCH v3 1/4] virtio/vsock: don't use skbuff state to account credit Arseniy Krasnov
2023-03-09 16:27 ` Stefano Garzarella
2023-03-09 10:12 ` [RFC PATCH v3 2/4] virtio/vsock: remove redundant 'skb_pull()' call Arseniy Krasnov
2023-03-09 16:29 ` Stefano Garzarella
2023-03-09 10:13 ` [RFC PATCH v3 3/4] virtio/vsock: don't drop skbuff on copy failure Arseniy Krasnov
2023-03-09 16:30 ` Stefano Garzarella
2023-03-09 10:14 ` [RFC PATCH v3 4/4] test/vsock: copy to user failure test Arseniy Krasnov
2023-03-09 16:30 ` Stefano Garzarella [this message]
2023-03-09 16:21 ` [RFC PATCH v3 0/4] several updates to virtio/vsock Stefano Garzarella
2023-03-09 16:20 ` Arseniy Krasnov
2023-03-09 16:32 ` Stefano Garzarella
2023-03-09 20:34 ` Arseniy Krasnov
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=20230309163034.bznx6pywv5a45egw@sgarzare-redhat \
--to=sgarzare@redhat.com \
--cc=avkrasnov@sberdevices.ru \
--cc=bobby.eshleman@bytedance.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kernel@sberdevices.ru \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=oxffffaa@gmail.com \
--cc=pabeni@redhat.com \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux-foundation.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).