2020-03-21 18:39:48

by Jens Axboe

[permalink] [raw]
Subject: [GIT PULL] io_uring fixes for 5.6-rc

Hi Linus,

Two different fixes in here:

- Fix for a potential NULL pointer deref for links with async or drain
marked (Pavel)

- Fix for not properly checking RLIMIT_NOFILE for async punted
operations. This affects openat/openat2, which were added this cycle,
and accept4. I did a full audit of other cases where we might check
current->signal->rlim[] and found only RLIMIT_FSIZE for buffered
writes and fallocate. That one is fixed and queued for 5.7 and marked
stable.

Please pull!


git://git.kernel.dk/linux-block.git tags/io_uring-5.6-20200320


----------------------------------------------------------------
Jens Axboe (2):
io_uring: make sure openat/openat2 honor rlimit nofile
io_uring: make sure accept honor rlimit nofile

Pavel Begunkov (1):
io_uring: NULL-deref for IOSQE_{ASYNC,DRAIN}

fs/file.c | 7 ++++++-
fs/io_uring.c | 18 ++++++++++++++++--
include/linux/file.h | 1 +
include/linux/socket.h | 3 ++-
net/socket.c | 8 +++++---
5 files changed, 30 insertions(+), 7 deletions(-)

--
Jens Axboe


2020-03-21 19:16:03

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [GIT PULL] io_uring fixes for 5.6-rc

The pull request you sent on Sat, 21 Mar 2020 12:38:34 -0600:

> git://git.kernel.dk/linux-block.git tags/io_uring-5.6-20200320

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1ab7ea1f83d16489142bcfa1b7670ac7ca86cd81

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker