| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20210603153801.xyew6p5d4x4orwka@steredhat>
Date: Thu, 3 Jun 2021 17:38:01 +0200
From: Stefano Garzarella <sgarzare@...hat.com>
To: Arseny Krasnov <arseny.krasnov@...persky.com>
Cc: Stefan Hajnoczi <stefanha@...hat.com>,
"Michael S. Tsirkin" <mst@...hat.com>,
Jason Wang <jasowang@...hat.com>,
"David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Jorgen Hansen <jhansen@...are.com>,
Colin Ian King <colin.king@...onical.com>,
Norbert Slusarek <nslusarek@....net>,
Andra Paraschiv <andraprs@...zon.com>, kvm@...r.kernel.org,
virtualization@...ts.linux-foundation.org, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, oxffffaa@...il.com
Subject: Re: [PATCH v10 17/18] vsock_test: add SOCK_SEQPACKET tests
On Thu, May 20, 2021 at 10:19:50PM +0300, Arseny Krasnov wrote:
>Implement two tests of SOCK_SEQPACKET socket: first sends data by
>several 'write()'s and checks that number of 'read()' were same.
>Second test checks MSG_TRUNC flag. Cases for connect(), bind(),
>etc. are not tested, because it is same as for stream socket.
>
>Signed-off-by: Arseny Krasnov <arseny.krasnov@...persky.com>
>---
> v9 -> v10:
> 1) Commit message updated.
> 2) Add second test for message bounds.
This patch LGTM, but I'll review better with the next version, running
also the test suite on my VMs.
Thanks,
Stefano
>
> tools/testing/vsock/util.c | 32 +++++++--
> tools/testing/vsock/util.h | 3 +
> tools/testing/vsock/vsock_test.c | 116 +++++++++++++++++++++++++++++++
> 3 files changed, 146 insertions(+), 5 deletions(-)
>
>diff --git a/tools/testing/vsock/util.c b/tools/testing/vsock/util.c
>index 93cbd6f603f9..2acbb7703c6a 100644
>--- a/tools/testing/vsock/util.c
>+++ b/tools/testing/vsock/util.c
>@@ -84,7 +84,7 @@ void vsock_wait_remote_close(int fd)
> }
>
> /* Connect to <cid, port> and return the file descriptor. */
>-int vsock_stream_connect(unsigned int cid, unsigned int port)
>+static int vsock_connect(unsigned int cid, unsigned int port, int type)
> {
> union {
> struct sockaddr sa;
>@@ -101,7 +101,7 @@ int vsock_stream_connect(unsigned int cid, unsigned int port)
>
> control_expectln("LISTENING");
>
>- fd = socket(AF_VSOCK, SOCK_STREAM, 0);
>+ fd = socket(AF_VSOCK, type, 0);
>
> timeout_begin(TIMEOUT);
> do {
>@@ -120,11 +120,21 @@ int vsock_stream_connect(unsigned int cid, unsigned int port)
> return fd;
> }
>
>+int vsock_stream_connect(unsigned int cid, unsigned int port)
>+{
>+ return vsock_connect(cid, port, SOCK_STREAM);
>+}
>+
>+int vsock_seqpacket_connect(unsigned int cid, unsigned int port)
>+{
>+ return vsock_connect(cid, port, SOCK_SEQPACKET);
>+}
>+
> /* Listen on <cid, port> and return the first incoming connection. The remote
> * address is stored to clientaddrp. clientaddrp may be NULL.
> */
>-int vsock_stream_accept(unsigned int cid, unsigned int port,
>- struct sockaddr_vm *clientaddrp)
>+static int vsock_accept(unsigned int cid, unsigned int port,
>+ struct sockaddr_vm *clientaddrp, int type)
> {
> union {
> struct sockaddr sa;
>@@ -145,7 +155,7 @@ int vsock_stream_accept(unsigned int cid, unsigned int port,
> int client_fd;
> int old_errno;
>
>- fd = socket(AF_VSOCK, SOCK_STREAM, 0);
>+ fd = socket(AF_VSOCK, type, 0);
>
> if (bind(fd, &addr.sa, sizeof(addr.svm)) < 0) {
> perror("bind");
>@@ -189,6 +199,18 @@ int vsock_stream_accept(unsigned int cid, unsigned int port,
> return client_fd;
> }
>
>+int vsock_stream_accept(unsigned int cid, unsigned int port,
>+ struct sockaddr_vm *clientaddrp)
>+{
>+ return vsock_accept(cid, port, clientaddrp, SOCK_STREAM);
>+}
>+
>+int vsock_seqpacket_accept(unsigned int cid, unsigned int port,
>+ struct sockaddr_vm *clientaddrp)
>+{
>+ return vsock_accept(cid, port, clientaddrp, SOCK_SEQPACKET);
>+}
>+
> /* Transmit one byte and check the return value.
> *
> * expected_ret:
>diff --git a/tools/testing/vsock/util.h b/tools/testing/vsock/util.h
>index e53dd09d26d9..a3375ad2fb7f 100644
>--- a/tools/testing/vsock/util.h
>+++ b/tools/testing/vsock/util.h
>@@ -36,8 +36,11 @@ struct test_case {
> void init_signals(void);
> unsigned int parse_cid(const char *str);
> int vsock_stream_connect(unsigned int cid, unsigned int port);
>+int vsock_seqpacket_connect(unsigned int cid, unsigned int port);
> int vsock_stream_accept(unsigned int cid, unsigned int port,
> struct sockaddr_vm *clientaddrp);
>+int vsock_seqpacket_accept(unsigned int cid, unsigned int port,
>+ struct sockaddr_vm *clientaddrp);
> void vsock_wait_remote_close(int fd);
> void send_byte(int fd, int expected_ret, int flags);
> void recv_byte(int fd, int expected_ret, int flags);
>diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c
>index 5a4fb80fa832..67766bfe176f 100644
>--- a/tools/testing/vsock/vsock_test.c
>+++ b/tools/testing/vsock/vsock_test.c
>@@ -14,6 +14,8 @@
> #include <errno.h>
> #include <unistd.h>
> #include <linux/kernel.h>
>+#include <sys/types.h>
>+#include <sys/socket.h>
>
> #include "timeout.h"
> #include "control.h"
>@@ -279,6 +281,110 @@ static void test_stream_msg_peek_server(const struct test_opts *opts)
> close(fd);
> }
>
>+#define MESSAGES_CNT 7
>+static void test_seqpacket_msg_bounds_client(const struct test_opts *opts)
>+{
>+ int fd;
>+
>+ fd = vsock_seqpacket_connect(opts->peer_cid, 1234);
>+ if (fd < 0) {
>+ perror("connect");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ /* Send several messages, one with MSG_EOR flag */
>+ for (int i = 0; i < MESSAGES_CNT; i++)
>+ send_byte(fd, 1, 0);
>+
>+ control_writeln("SENDDONE");
>+ close(fd);
>+}
>+
>+static void test_seqpacket_msg_bounds_server(const struct test_opts *opts)
>+{
>+ int fd;
>+ char buf[16];
>+ struct msghdr msg = {0};
>+ struct iovec iov = {0};
>+
>+ fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL);
>+ if (fd < 0) {
>+ perror("accept");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ control_expectln("SENDDONE");
>+ iov.iov_base = buf;
>+ iov.iov_len = sizeof(buf);
>+ msg.msg_iov = &iov;
>+ msg.msg_iovlen = 1;
>+
>+ for (int i = 0; i < MESSAGES_CNT; i++) {
>+ if (recvmsg(fd, &msg, 0) != 1) {
>+ perror("message bound violated");
>+ exit(EXIT_FAILURE);
>+ }
>+ }
>+
>+ close(fd);
>+}
>+
>+#define MESSAGE_TRUNC_SZ 32
>+static void test_seqpacket_msg_trunc_client(const struct test_opts *opts)
>+{
>+ int fd;
>+ char buf[MESSAGE_TRUNC_SZ];
>+
>+ fd = vsock_seqpacket_connect(opts->peer_cid, 1234);
>+ if (fd < 0) {
>+ perror("connect");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ if (send(fd, buf, sizeof(buf), 0) != sizeof(buf)) {
>+ perror("send failed");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ control_writeln("SENDDONE");
>+ close(fd);
>+}
>+
>+static void test_seqpacket_msg_trunc_server(const struct test_opts *opts)
>+{
>+ int fd;
>+ char buf[MESSAGE_TRUNC_SZ / 2];
>+ struct msghdr msg = {0};
>+ struct iovec iov = {0};
>+
>+ fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL);
>+ if (fd < 0) {
>+ perror("accept");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ control_expectln("SENDDONE");
>+ iov.iov_base = buf;
>+ iov.iov_len = sizeof(buf);
>+ msg.msg_iov = &iov;
>+ msg.msg_iovlen = 1;
>+
>+ ssize_t ret = recvmsg(fd, &msg, MSG_TRUNC);
>+
>+ if (ret != MESSAGE_TRUNC_SZ) {
>+ printf("%zi\n", ret);
>+ perror("MSG_TRUNC doesn't work");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ if (!(msg.msg_flags & MSG_TRUNC)) {
>+ fprintf(stderr, "MSG_TRUNC expected\n");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ close(fd);
>+}
>+
> static struct test_case test_cases[] = {
> {
> .name = "SOCK_STREAM connection reset",
>@@ -309,6 +415,16 @@ static struct test_case test_cases[] = {
> .run_client = test_stream_msg_peek_client,
> .run_server = test_stream_msg_peek_server,
> },
>+ {
>+ .name = "SOCK_SEQPACKET msg bounds",
>+ .run_client = test_seqpacket_msg_bounds_client,
>+ .run_server = test_seqpacket_msg_bounds_server,
>+ },
>+ {
>+ .name = "SOCK_SEQPACKET MSG_TRUNC flag",
>+ .run_client = test_seqpacket_msg_trunc_client,
>+ .run_server = test_seqpacket_msg_trunc_server,
>+ },
> {},
> };
>
>--
>2.25.1
>
Powered by blists - more mailing lists