lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'nfs-for-3.11-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Browse Source 
Pull NFS client bugfix from Trond Myklebust:
 "Stable patch to fix a highmem-related data corruption issue on 32-bit
  ARM platforms"

* tag 'nfs-for-3.11-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  SUNRPC: Fix memory corruption issue on 32-bit highmem systems
This commit is contained in:
Linus Torvalds
2013-08-29 17:00:40 -07:00
parent c95389b4cd 347e2233b7
commit 06a557f7a6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/sunrpc/xdr.c
View File

@@ -207,10 +207,13 @@ _shift_data_right_pages(struct page **pages, size_t pgto_base,
pgfrom_base -= copy; pgfrom_base -= copy;
vto = kmap_atomic(*pgto); vto = kmap_atomic(*pgto);
vfrom = kmap_atomic(*pgfrom); if (*pgto != *pgfrom) {
memmove(vto + pgto_base, vfrom + pgfrom_base, copy); vfrom = kmap_atomic(*pgfrom);
memcpy(vto + pgto_base, vfrom + pgfrom_base, copy);
kunmap_atomic(vfrom);
} else
memmove(vto + pgto_base, vto + pgfrom_base, copy);
flush_dcache_page(*pgto); flush_dcache_page(*pgto);
kunmap_atomic(vfrom);
kunmap_atomic(vto); kunmap_atomic(vto);
} while ((len -= copy) != 0); } while ((len -= copy) != 0);