summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2023-01-18 07:05:47 -0500
committerKent Overstreet <kent.overstreet@linux.dev>2023-06-21 03:32:17 -0400
commitd08fd4902e223d56aec80096da2065908f00e2ba (patch)
treeb432dc5a1c1662cd9d0174472026a48dbafe7075
parent2018c2c75988f7c5e3e6802e7752acffc4c44c49 (diff)
fs/aio: Use kmap_local() instead of kmap()
Originally, we used kmap() instead of kmap_atomic() for reading events out of the completion ringbuffer because we're using copy_to_user(), which can fault. Now that kmap_local() is a thing, use that instead. Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev> Cc: Benjamin LaHaise <bcrl@kvack.org Cc: linux-aio@kvack.org Cc: linux-fsdevel@vger.kernel.org
-rw-r--r--fs/aio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/aio.c b/fs/aio.c
index b0b17bd098bb..e1ba4b83998d 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1250,10 +1250,10 @@ static long aio_read_events_ring(struct kioctx *ctx,
avail = min(avail, nr - ret);
avail = min_t(long, avail, AIO_EVENTS_PER_PAGE - pos);
- ev = kmap(page);
+ ev = kmap_local_page(page);
copy_ret = copy_to_user(event + ret, ev + pos,
sizeof(*ev) * avail);
- kunmap(page);
+ kunmap_local(ev);
if (unlikely(copy_ret)) {
ret = -EFAULT;