summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorAnthony Romano <anthony.romano@coreos.com>2016-06-25 00:48:43 +0300
committerBen Hutchings <ben@decadent.org.uk>2016-08-23 00:38:20 +0300
commitc248b3ba3ad07a74e77f493c2b8c4963fa59ce93 (patch)
tree3c6ee508ae98c399335bcf709ff1d8090f518b0d /mm
parent2e4378ee60049b752c9dce16f62ce6fbd11b379a (diff)
downloadlinux-c248b3ba3ad07a74e77f493c2b8c4963fa59ce93.tar.xz
tmpfs: don't undo fallocate past its last page
commit b9b4bb26af017dbe930cd4df7f9b2fc3a0497bfe upstream. When fallocate is interrupted it will undo a range that extends one byte past its range of allocated pages. This can corrupt an in-use page by zeroing out its first byte. Instead, undo using the inclusive byte range. Fixes: 1635f6a74152f1d ("tmpfs: undo fallocation on failure") Link: http://lkml.kernel.org/r/1462713387-16724-1-git-send-email-anthony.romano@coreos.com Signed-off-by: Anthony Romano <anthony.romano@coreos.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Hugh Dickins <hughd@google.com> Cc: Brandon Philips <brandon@ifup.co> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> [bwh: Backported to 3.16: use PAGE_CACHE_SHIFT instead of PAGE_SHIFT] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'mm')
-rw-r--r--mm/shmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index e53ab3a8a8d3..c4dc08ae240f 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1867,7 +1867,7 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,
/* Remove the !PageUptodate pages we added */
shmem_undo_range(inode,
(loff_t)start << PAGE_CACHE_SHIFT,
- (loff_t)index << PAGE_CACHE_SHIFT, true);
+ ((loff_t)index << PAGE_CACHE_SHIFT) - 1, true);
goto undone;
}