https://github.com/torvalds/linux
Revision e2a50c1f64145a04959df2442305d57307e5395a authored by Andrea Arcangeli on 30 November 2018, 22:09:37 UTC, committed by Linus Torvalds on 30 November 2018, 22:56:14 UTC
With MAP_SHARED: recheck the i_size after taking the PT lock, to serialize against truncate with the PT lock. Delete the page from the pagecache if the i_size_read check fails. With MAP_PRIVATE: check the i_size after the PT lock before mapping anonymous memory or zeropages into the MAP_PRIVATE shmem mapping. A mostly irrelevant cleanup: like we do the delete_from_page_cache() pagecache removal after dropping the PT lock, the PT lock is a spinlock so drop it before the sleepable page lock. Link: http://lkml.kernel.org/r/20181126173452.26955-5-aarcange@redhat.com Fixes: 4c27fe4c4c84 ("userfaultfd: shmem: add shmem_mcopy_atomic_pte for userfaultfd support") Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> Reviewed-by: Mike Rapoport <rppt@linux.ibm.com> Reviewed-by: Hugh Dickins <hughd@google.com> Reported-by: Jann Horn <jannh@google.com> Cc: <stable@vger.kernel.org> Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> Cc: Mike Kravetz <mike.kravetz@oracle.com> Cc: 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>
1 parent 29ec906
Tip revision: e2a50c1f64145a04959df2442305d57307e5395a authored by Andrea Arcangeli on 30 November 2018, 22:09:37 UTC
userfaultfd: shmem: add i_size checks
userfaultfd: shmem: add i_size checks
Tip revision: e2a50c1
File | Mode | Size |
---|---|---|
kasan | ||
Kconfig | -rw-r--r-- | 24.6 KB |
Kconfig.debug | -rw-r--r-- | 3.8 KB |
Makefile | -rw-r--r-- | 3.5 KB |
backing-dev.c | -rw-r--r-- | 26.9 KB |
balloon_compaction.c | -rw-r--r-- | 5.5 KB |
cleancache.c | -rw-r--r-- | 9.9 KB |
cma.c | -rw-r--r-- | 13.9 KB |
cma.h | -rw-r--r-- | 573 bytes |
cma_debug.c | -rw-r--r-- | 4.5 KB |
compaction.c | -rw-r--r-- | 58.8 KB |
debug.c | -rw-r--r-- | 5.5 KB |
debug_page_ref.c | -rw-r--r-- | 1.4 KB |
dmapool.c | -rw-r--r-- | 13.7 KB |
early_ioremap.c | -rw-r--r-- | 6.8 KB |
fadvise.c | -rw-r--r-- | 5.3 KB |
failslab.c | -rw-r--r-- | 1.4 KB |
filemap.c | -rw-r--r-- | 89.8 KB |
frame_vector.c | -rw-r--r-- | 6.4 KB |
frontswap.c | -rw-r--r-- | 14.2 KB |
gup.c | -rw-r--r-- | 51.3 KB |
gup_benchmark.c | -rw-r--r-- | 2.8 KB |
highmem.c | -rw-r--r-- | 11.7 KB |
hmm.c | -rw-r--r-- | 39.2 KB |
huge_memory.c | -rw-r--r-- | 81.9 KB |
hugetlb.c | -rw-r--r-- | 132.8 KB |
hugetlb_cgroup.c | -rw-r--r-- | 10.9 KB |
hwpoison-inject.c | -rw-r--r-- | 3.2 KB |
init-mm.c | -rw-r--r-- | 1.2 KB |
internal.h | -rw-r--r-- | 16.4 KB |
interval_tree.c | -rw-r--r-- | 3.1 KB |
khugepaged.c | -rw-r--r-- | 47.7 KB |
kmemleak-test.c | -rw-r--r-- | 3.2 KB |
kmemleak.c | -rw-r--r-- | 59.8 KB |
ksm.c | -rw-r--r-- | 88.2 KB |
list_lru.c | -rw-r--r-- | 14.6 KB |
maccess.c | -rw-r--r-- | 3.3 KB |
madvise.c | -rw-r--r-- | 22.8 KB |
memblock.c | -rw-r--r-- | 56.5 KB |
memcontrol.c | -rw-r--r-- | 169.3 KB |
memfd.c | -rw-r--r-- | 7.8 KB |
memory-failure.c | -rw-r--r-- | 52.1 KB |
memory.c | -rw-r--r-- | 123.1 KB |
memory_hotplug.c | -rw-r--r-- | 47.9 KB |
mempolicy.c | -rw-r--r-- | 70.8 KB |
mempool.c | -rw-r--r-- | 15.5 KB |
memtest.c | -rw-r--r-- | 2.8 KB |
migrate.c | -rw-r--r-- | 75.7 KB |
mincore.c | -rw-r--r-- | 6.7 KB |
mlock.c | -rw-r--r-- | 22.6 KB |
mm_init.c | -rw-r--r-- | 4.8 KB |
mmap.c | -rw-r--r-- | 100.0 KB |
mmu_context.c | -rw-r--r-- | 1.3 KB |
mmu_gather.c | -rw-r--r-- | 6.3 KB |
mmu_notifier.c | -rw-r--r-- | 11.7 KB |
mmzone.c | -rw-r--r-- | 2.4 KB |
mprotect.c | -rw-r--r-- | 15.6 KB |
mremap.c | -rw-r--r-- | 17.1 KB |
msync.c | -rw-r--r-- | 2.6 KB |
nommu.c | -rw-r--r-- | 47.6 KB |
oom_kill.c | -rw-r--r-- | 30.6 KB |
page-writeback.c | -rw-r--r-- | 83.9 KB |
page_alloc.c | -rw-r--r-- | 224.9 KB |
page_counter.c | -rw-r--r-- | 6.6 KB |
page_ext.c | -rw-r--r-- | 11.1 KB |
page_idle.c | -rw-r--r-- | 5.5 KB |
page_io.c | -rw-r--r-- | 10.5 KB |
page_isolation.c | -rw-r--r-- | 8.7 KB |
page_owner.c | -rw-r--r-- | 15.1 KB |
page_poison.c | -rw-r--r-- | 2.8 KB |
page_vma_mapped.c | -rw-r--r-- | 7.6 KB |
pagewalk.c | -rw-r--r-- | 8.7 KB |
percpu-internal.h | -rw-r--r-- | 5.9 KB |
percpu-km.c | -rw-r--r-- | 2.9 KB |
percpu-stats.c | -rw-r--r-- | 5.7 KB |
percpu-vm.c | -rw-r--r-- | 10.3 KB |
percpu.c | -rw-r--r-- | 84.6 KB |
pgtable-generic.c | -rw-r--r-- | 5.3 KB |
process_vm_access.c | -rw-r--r-- | 10.0 KB |
quicklist.c | -rw-r--r-- | 2.4 KB |
readahead.c | -rw-r--r-- | 16.4 KB |
rmap.c | -rw-r--r-- | 54.2 KB |
rodata_test.c | -rw-r--r-- | 1.4 KB |
shmem.c | -rw-r--r-- | 103.6 KB |
slab.c | -rw-r--r-- | 111.0 KB |
slab.h | -rw-r--r-- | 14.6 KB |
slab_common.c | -rw-r--r-- | 37.9 KB |
slob.c | -rw-r--r-- | 16.2 KB |
slub.c | -rw-r--r-- | 142.1 KB |
sparse-vmemmap.c | -rw-r--r-- | 6.6 KB |
sparse.c | -rw-r--r-- | 20.5 KB |
swap.c | -rw-r--r-- | 28.6 KB |
swap_cgroup.c | -rw-r--r-- | 5.2 KB |
swap_slots.c | -rw-r--r-- | 9.4 KB |
swap_state.c | -rw-r--r-- | 21.7 KB |
swapfile.c | -rw-r--r-- | 95.7 KB |
truncate.c | -rw-r--r-- | 26.3 KB |
usercopy.c | -rw-r--r-- | 9.4 KB |
userfaultfd.c | -rw-r--r-- | 16.0 KB |
util.c | -rw-r--r-- | 19.5 KB |
vmacache.c | -rw-r--r-- | 2.7 KB |
vmalloc.c | -rw-r--r-- | 69.7 KB |
vmpressure.c | -rw-r--r-- | 13.9 KB |
vmscan.c | -rw-r--r-- | 120.9 KB |
vmstat.c | -rw-r--r-- | 51.8 KB |
workingset.c | -rw-r--r-- | 19.2 KB |
z3fold.c | -rw-r--r-- | 30.6 KB |
zbud.c | -rw-r--r-- | 18.2 KB |
zpool.c | -rw-r--r-- | 10.7 KB |
zsmalloc.c | -rw-r--r-- | 60.4 KB |
zswap.c | -rw-r--r-- | 34.7 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...