From: Axel Rasmussen <axelrasmussen@google.com>
To: Andrea Arcangeli <aarcange@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Hugh Dickins <hughd@google.com>, Peter Xu <peterx@redhat.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>,
Lokesh Gidra <lokeshgidra@google.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH] userfaultfd: release page in error path to avoid BUG_ON
Date: Wed, 28 Apr 2021 11:01:09 -0700 [thread overview]
Message-ID: <20210428180109.293606-1-axelrasmussen@google.com> (raw)
Consider the following sequence of events (described from the point of
view of the commit that introduced the bug - see "Fixes:" below):
1. Userspace issues a UFFD ioctl, which ends up calling into
shmem_mcopy_atomic_pte(). We successfully account the blocks, we
shmem_alloc_page(), but then the copy_from_user() fails. We return
-EFAULT. We don't release the page we allocated.
2. Our caller detects this error code, tries the copy_from_user() after
dropping the mmap_sem, and retries, calling back into
shmem_mcopy_atomic_pte().
3. Meanwhile, let's say another process filled up the tmpfs being used.
4. So shmem_mcopy_atomic_pte() fails to account blocks this time, and
immediately returns - without releasing the page. This triggers a
BUG_ON in our caller, which asserts that the page should always be
consumed, unless -EFAULT is returned.
(Later on in the commit history, -EFAULT became -ENOENT, mmap_sem became
mmap_lock, and shmem_inode_acct_block() was added.)
A malicious user (even an unprivileged one) could trigger this
intentionally without too much trouble.
To fix this, detect if we have a "dangling" page when accounting fails,
and if so, release it before returning.
Fixes: cb658a453b93 ("userfaultfd: shmem: avoid leaking blocks and used blocks in UFFDIO_COPY")
Reported-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
---
mm/shmem.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index 26c76b13ad23..46766c9d7151 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2375,8 +2375,19 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,
pgoff_t offset, max_off;
ret = -ENOMEM;
- if (!shmem_inode_acct_block(inode, 1))
+ if (!shmem_inode_acct_block(inode, 1)) {
+ /*
+ * We may have got a page, returned -ENOENT triggering a retry,
+ * and now we find ourselves with -ENOMEM. Release the page, to
+ * avoid a BUG_ON in our caller.
+ */
+ if (unlikely(*pagep)) {
+ unlock_page(*pagep);
+ put_page(*pagep);
+ *pagep = NULL;
+ }
goto out;
+ }
if (!*pagep) {
page = shmem_alloc_page(gfp, info, pgoff);
--
2.31.1.498.g6c1eba8ee3d-goog
next reply other threads:[~2021-04-28 18:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-28 18:01 Axel Rasmussen [this message]
2021-04-28 18:39 ` [PATCH] userfaultfd: release page in error path to avoid BUG_ON Peter Xu
2021-04-28 21:03 ` Hugh Dickins
2021-04-28 21:24 ` Peter Xu
2021-04-28 21:26 ` Axel Rasmussen
2021-04-28 23:08 ` [PATCH v2] " Axel Rasmussen
2021-04-28 23:56 ` Hugh Dickins
2021-04-29 0:08 ` Peter Xu
2021-05-05 22:13 ` Axel Rasmussen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210428180109.293606-1-axelrasmussen@google.com \
--to=axelrasmussen@google.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lokeshgidra@google.com \
--cc=peterx@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).