github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 16:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'vsock-handle-writes-to-shutdowned-socket'

Browse Source 
Arseniy Krasnov says:

====================
vsock: handle writes to shutdowned socket

this small patchset adds POSIX compliant behaviour on writes to the
socket which was shutdowned with 'shutdown()' (both sides - local with
SHUT_WR flag, peer - with SHUT_RD flag). According POSIX we must send
SIGPIPE in such cases (but SIGPIPE is not send when MSG_NOSIGNAL is set).

First patch is implemented in the same way as net/ipv4/tcp.c:tcp_sendmsg_locked().
It uses 'sk_stream_error()' function which handles EPIPE error. Another
way is to use code from net/unix/af_unix.c:unix_stream_sendmsg() where
same logic from 'sk_stream_error()' is implemented "from scratch", but
it doesn't check 'sk_err' field. I think error from this field has more
priority to be returned from syscall. So I guess it is better to reuse
currently implemented 'sk_stream_error()' function.

Test is also added.
====================

Link: https://lore.kernel.org/r/20230911202027.1928574-1-avkrasnov@salutedevices.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Paolo Abeni 2023-09-14 08:19:59 +02:00
commit ea8f505ec5
2 changed files with 141 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/vmw_vsock/af_vsock.c
View File

@ -1921,6 +1921,9 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg,
err = total_written;
}
out:
if (sk->sk_type == SOCK_STREAM)
err = sk_stream_error(sk, msg->msg_flags, err);
release_sock(sk);
return err;
}

138
tools/testing/vsock/vsock_test.c
View File

@ -19,6 +19,7 @@
#include <time.h>
#include <sys/mman.h>
#include <poll.h>
#include <signal.h>
#include "timeout.h"
#include "control.h"
@ -1170,6 +1171,133 @@ static void test_seqpacket_msg_peek_server(const struct test_opts *opts)
return test_msg_peek_server(opts, true);
}
static sig_atomic_t have_sigpipe;
static void sigpipe(int signo)
{
have_sigpipe = 1;
}
static void test_stream_check_sigpipe(int fd)
{
ssize_t res;
have_sigpipe = 0;
res = send(fd, "A", 1, 0);
if (res != -1) {
fprintf(stderr, "expected send(2) failure, got %zi\n", res);
exit(EXIT_FAILURE);
}
if (!have_sigpipe) {
fprintf(stderr, "SIGPIPE expected\n");
exit(EXIT_FAILURE);
}
have_sigpipe = 0;
res = send(fd, "A", 1, MSG_NOSIGNAL);
if (res != -1) {
fprintf(stderr, "expected send(2) failure, got %zi\n", res);
exit(EXIT_FAILURE);
}
if (have_sigpipe) {
fprintf(stderr, "SIGPIPE not expected\n");
exit(EXIT_FAILURE);
}
}
static void test_stream_shutwr_client(const struct test_opts *opts)
{
int fd;
struct sigaction act = {
.sa_handler = sigpipe,
};
sigaction(SIGPIPE, &act, NULL);
fd = vsock_stream_connect(opts->peer_cid, 1234);
if (fd < 0) {
perror("connect");
exit(EXIT_FAILURE);
}
if (shutdown(fd, SHUT_WR)) {
perror("shutdown");
exit(EXIT_FAILURE);
}
test_stream_check_sigpipe(fd);
control_writeln("CLIENTDONE");
close(fd);
}
static void test_stream_shutwr_server(const struct test_opts *opts)
{
int fd;
fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL);
if (fd < 0) {
perror("accept");
exit(EXIT_FAILURE);
}
control_expectln("CLIENTDONE");
close(fd);
}
static void test_stream_shutrd_client(const struct test_opts *opts)
{
int fd;
struct sigaction act = {
.sa_handler = sigpipe,
};
sigaction(SIGPIPE, &act, NULL);
fd = vsock_stream_connect(opts->peer_cid, 1234);
if (fd < 0) {
perror("connect");
exit(EXIT_FAILURE);
}
control_expectln("SHUTRDDONE");
test_stream_check_sigpipe(fd);
control_writeln("CLIENTDONE");
close(fd);
}
static void test_stream_shutrd_server(const struct test_opts *opts)
{
int fd;
fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL);
if (fd < 0) {
perror("accept");
exit(EXIT_FAILURE);
}
if (shutdown(fd, SHUT_RD)) {
perror("shutdown");
exit(EXIT_FAILURE);
}
control_writeln("SHUTRDDONE");
control_expectln("CLIENTDONE");
close(fd);
}
static struct test_case test_cases[] = {
{
.name = "SOCK_STREAM connection reset",
@ -1250,6 +1378,16 @@ static struct test_case test_cases[] = {
.run_client = test_seqpacket_msg_peek_client,
.run_server = test_seqpacket_msg_peek_server,
},
{
.name = "SOCK_STREAM SHUT_WR",
.run_client = test_stream_shutwr_client,
.run_server = test_stream_shutwr_server,
},
{
.name = "SOCK_STREAM SHUT_RD",
.run_client = test_stream_shutrd_client,
.run_server = test_stream_shutrd_server,
},
{},
};