The patch titled mm: fix XIP file writes has been added to the -mm tree. Its filename is mm-fix-xip-file-writes.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: mm: fix XIP file writes From: Nick Piggin <npiggin@xxxxxxx> 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: Nick Piggin <npiggin@xxxxxxx> Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx> Cc: Carsten Otte <cotte@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/filemap_xip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/filemap_xip.c~mm-fix-xip-file-writes mm/filemap_xip.c --- a/mm/filemap_xip.c~mm-fix-xip-file-writes +++ a/mm/filemap_xip.c @@ -314,7 +314,7 @@ __xip_file_write(struct file *filp, cons 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); _ Patches currently in -mm which might be from npiggin@xxxxxxx are mm-fix-xip-file-writes.patch git-jfs.patch nfs-use-gfp_nofs-preloads-for-radix-tree-insertion.patch slub-use-non-atomic-bit-unlock.patch radix-tree-avoid-atomic-allocations-for-preloaded-insertions.patch mm-dont-allow-ioremapping-of-ranges-larger-than-vmalloc-space.patch vt-bitlock-fix.patch radix_treeh-trivial-comment-correction.patch inotify-fix-race.patch inotify-remove-debug-code.patch rewrite-rd.patch rewrite-rd-fix.patch reiser4.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html