Commit 76cd979f authored by Stefan Metzmacher's avatar Stefan Metzmacher Committed by Jens Axboe
Browse files

io_uring: imply MSG_NOSIGNAL for send[msg]()/recv[msg]() calls 



We never want to generate any SIGPIPE, -EPIPE only is much better.

Signed-off-by: default avatarStefan Metzmacher <metze@samba.org>
Link: https://lore.kernel.org/r/38961085c3ec49fd21550c7788f214d1ff02d2d4.1615908477.git.metze@samba.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b7f5a0bf

fs/io_uring.c

+4 −4
Original line number Diff line number Diff line
@@ -4384,7 +4384,7 @@ static int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags) 
		kmsg = &iomsg;

	}



	flags = req->sr_msg.msg_flags;

	flags = req->sr_msg.msg_flags | MSG_NOSIGNAL;

	if (flags & MSG_DONTWAIT)

		req->flags |= REQ_F_NOWAIT;

	else if (issue_flags & IO_URING_F_NONBLOCK)
@@ -4428,7 +4428,7 @@ static int io_send(struct io_kiocb *req, unsigned int issue_flags) 
	msg.msg_controllen = 0;

	msg.msg_namelen = 0;



	flags = req->sr_msg.msg_flags;

	flags = req->sr_msg.msg_flags | MSG_NOSIGNAL;

	if (flags & MSG_DONTWAIT)

		req->flags |= REQ_F_NOWAIT;

	else if (issue_flags & IO_URING_F_NONBLOCK)
@@ -4618,7 +4618,7 @@ static int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags) 
				1, req->sr_msg.len);

	}



	flags = req->sr_msg.msg_flags;

	flags = req->sr_msg.msg_flags | MSG_NOSIGNAL;

	if (flags & MSG_DONTWAIT)

		req->flags |= REQ_F_NOWAIT;

	else if (force_nonblock)
@@ -4677,7 +4677,7 @@ static int io_recv(struct io_kiocb *req, unsigned int issue_flags) 
	msg.msg_iocb = NULL;

	msg.msg_flags = 0;



	flags = req->sr_msg.msg_flags;

	flags = req->sr_msg.msg_flags | MSG_NOSIGNAL;

	if (flags & MSG_DONTWAIT)

		req->flags |= REQ_F_NOWAIT;

	else if (force_nonblock)