io_uring: convert accept4() -ERESTARTSYS into -EINTR

PATCH New Jens Axboe 1 participant 1 message Nov 10, 2019

Subsystems (2)

VFS io_uring

lore

Share & tools

lore

Jens Axboe

author maintainer

2019-11-10 02:35 UTC #0 lore raw

PATCH 1/1 io_uring: convert accept4() -ERESTARTSYS into -EINTR

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]>

---

fs/io_uring.c +2 -0

index 6db27bc9b2e3..059773c5d2ce 100644
@@ -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);

Signature · 1 line

Jens Axboe