public inbox for [email protected]
 help / color / mirror / Atom feed
* [PATCH] io_uring: convert accept4() -ERESTARTSYS into -EINTR
@ 2019-11-10  2:35 Jens Axboe
  0 siblings, 0 replies; only message in thread
From: Jens Axboe @ 2019-11-10  2:35 UTC (permalink / raw)
  To: io-uring; +Cc: Hrvoje Zeba

If we cancel a pending accept operating with a signal, we get
-ERESTARTSYS returned. Turn that into -EINTR for userspace, we should
not be return -ERESTARTSYS.

Reported-by: Hrvoje Zeba <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>

---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 6db27bc9b2e3..059773c5d2ce 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1920,6 +1920,8 @@ static int io_accept(struct io_kiocb *req, const struct io_uring_sqe *sqe,
 		req->work.flags |= IO_WQ_WORK_NEEDS_FILES;
 		return -EAGAIN;
 	}
+	if (ret == -ERESTARTSYS)
+		ret = -EINTR;
 	if (ret < 0 && (req->flags & REQ_F_LINK))
 		req->flags |= REQ_F_FAIL_LINK;
 	io_cqring_add_event(req, ret);

-- 
Jens Axboe


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2019-11-10  2:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-10  2:35 [PATCH] io_uring: convert accept4() -ERESTARTSYS into -EINTR Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox