summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Jenkins <sethjenkins@google.com>2023-01-31 12:25:55 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-02-22 12:55:54 +0100
commitc261f798f7baa8080cf0214081d43d5f86bb073f (patch)
treeff0bd3997ec6f952538a5e6741022dbc5496b850
parent2dcb474af1d5d06c1e343a0d7248219bb87a08b7 (diff)
downloadlinux-c261f798f7baa8080cf0214081d43d5f86bb073f.tar.gz
linux-c261f798f7baa8080cf0214081d43d5f86bb073f.tar.bz2
linux-c261f798f7baa8080cf0214081d43d5f86bb073f.zip
aio: fix mremap after fork null-deref
commit 81e9d6f8647650a7bead74c5f926e29970e834d1 upstream. Commit e4a0d3e720e7 ("aio: Make it possible to remap aio ring") introduced a null-deref if mremap is called on an old aio mapping after fork as mm->ioctx_table will be set to NULL. [jmoyer@redhat.com: fix 80 column issue] Link: https://lkml.kernel.org/r/x49sffq4nvg.fsf@segfault.boston.devel.redhat.com Fixes: e4a0d3e720e7 ("aio: Make it possible to remap aio ring") Signed-off-by: Seth Jenkins <sethjenkins@google.com> Signed-off-by: Jeff Moyer <jmoyer@redhat.com> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Benjamin LaHaise <bcrl@kvack.org> Cc: Jann Horn <jannh@google.com> Cc: Pavel Emelyanov <xemul@parallels.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/aio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 2a9dfa58ec3a..5934ea84b499 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -335,6 +335,9 @@ static int aio_ring_mremap(struct vm_area_struct *vma)
spin_lock(&mm->ioctx_lock);
rcu_read_lock();
table = rcu_dereference(mm->ioctx_table);
+ if (!table)
+ goto out_unlock;
+
for (i = 0; i < table->nr; i++) {
struct kioctx *ctx;
@@ -348,6 +351,7 @@ static int aio_ring_mremap(struct vm_area_struct *vma)
}
}
+out_unlock:
rcu_read_unlock();
spin_unlock(&mm->ioctx_lock);
return res;