Skip to content

Commit

Permalink
userfaultfd: fix a race between writeprotect and exit_mmap()
Browse files Browse the repository at this point in the history
jira VULN-4370
cve CVE-2021-47461
commit-author Nadav Amit <namit@vmware.com>
commit cb185d5

A race is possible when a process exits, its VMAs are removed by
exit_mmap() and at the same time userfaultfd_writeprotect() is called.

The race was detected by KASAN on a development kernel, but it appears
to be possible on vanilla kernels as well.

Use mmget_not_zero() to prevent the race as done in other userfaultfd
operations.

Link: https://lkml.kernel.org/r/20210921200247.25749-1-namit@vmware.com
Fixes: 63b2d41 ("userfaultfd: wp: add the writeprotect API to userfaultfd ioctl")
	Signed-off-by: Nadav Amit <namit@vmware.com>
	Tested-by: Li  Wang <liwang@redhat.com>
	Reviewed-by: Peter Xu <peterx@redhat.com>
	Cc: Andrea Arcangeli <aarcange@redhat.com>
	Cc: <stable@vger.kernel.org>
	Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
	Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit cb185d5)
	Signed-off-by: Greg Rose <g.v.rose@ciq.com>
  • Loading branch information
gvrose8192 committed Nov 14, 2024
1 parent 0c3116e commit 6fbe7a7
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions fs/userfaultfd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1801,9 +1801,15 @@ static int userfaultfd_writeprotect(struct userfaultfd_ctx *ctx,
if (mode_wp && mode_dontwake)
return -EINVAL;

ret = mwriteprotect_range(ctx->mm, uffdio_wp.range.start,
uffdio_wp.range.len, mode_wp,
&ctx->mmap_changing);
if (mmget_not_zero(ctx->mm)) {
ret = mwriteprotect_range(ctx->mm, uffdio_wp.range.start,
uffdio_wp.range.len, mode_wp,
&ctx->mmap_changing);
mmput(ctx->mm);
} else {
return -ESRCH;
}

if (ret)
return ret;

Expand Down

0 comments on commit 6fbe7a7

Please sign in to comment.