summaryrefslogtreecommitdiff
path: root/include/linux/plist.h
diff options
context:
space:
mode:
authorAxel Rasmussen <axelrasmussen@google.com>2021-05-15 03:27:19 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-19 11:08:29 +0300
commitb3f1731c6d7fbc1ebe3ed8eff6d6bec56d76ff43 (patch)
treebfe5d40c9ef84500fc4c6b330208d73d7e38d41f /include/linux/plist.h
parent1b8d4206a48ccb4eab7e061c2bb1f0a501b94627 (diff)
downloadlinux-b3f1731c6d7fbc1ebe3ed8eff6d6bec56d76ff43.tar.xz
userfaultfd: release page in error path to avoid BUG_ON
commit 7ed9d238c7dbb1fdb63ad96a6184985151b0171c upstream. Consider the following sequence of events: 1. Userspace issues a UFFD ioctl, which ends up calling into shmem_mfill_atomic_pte(). We successfully account the blocks, we shmem_alloc_page(), but then the copy_from_user() fails. We return -ENOENT. We don't release the page we allocated. 2. Our caller detects this error code, tries the copy_from_user() after dropping the mmap_lock, and retries, calling back into shmem_mfill_atomic_pte(). 3. Meanwhile, let's say another process filled up the tmpfs being used. 4. So shmem_mfill_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 -ENOENT is returned. To fix this, detect if we have such a "dangling" page when accounting fails, and if so, release it before returning. Link: https://lkml.kernel.org/r/20210428230858.348400-1-axelrasmussen@google.com Fixes: cb658a453b93 ("userfaultfd: shmem: avoid leaking blocks and used blocks in UFFDIO_COPY") Signed-off-by: Axel Rasmussen <axelrasmussen@google.com> Reported-by: Hugh Dickins <hughd@google.com> Acked-by: Hugh Dickins <hughd@google.com> Reviewed-by: Peter Xu <peterx@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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/plist.h')
0 files changed, 0 insertions, 0 deletions