Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 369b8f5a authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

mm: fix XIP file writes 



Writing to XIP files at a non-page-aligned offset results in data corruption
because the writes were always sent to the start of the page.

Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: default avatarCarsten Otte <cotte@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4670df83

mm/filemap_xip.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ __xip_file_write(struct file *filp, const char __user *buf, 
		fault_in_pages_readable(buf, bytes);

		kaddr = kmap_atomic(page, KM_USER0);

		copied = bytes -

			__copy_from_user_inatomic_nocache(kaddr, buf, bytes);

			__copy_from_user_inatomic_nocache(kaddr + offset, buf, bytes);

		kunmap_atomic(kaddr, KM_USER0);

		flush_dcache_page(page);