debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Update to 3.13 

svn path=/dists/trunk/linux/; revision=20986
This commit is contained in:
Ben Hutchings 2014-01-20 03:23:41 +00:00
parent 04aa0d4809
commit 34fdb2ec3b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/patches/features/all/aufs3/aufs3-mmap.patch vendored
View File

@ -8,6 +8,9 @@ Patch headers added by debian/patches/features/all/aufs3/gen-patch
aufs3.x-rcN mmap patch
[bwh: Resolved conflict with commit 4eb919825e6c ('mm: fix use-after-free
in sys_remap_file_pages')]
diff --git a/fs/buffer.c b/fs/buffer.c
index 6024877..95bbf13 100644
--- a/fs/buffer.c
@ -226,16 +229,17 @@ diff --git a/mm/fremap.c b/mm/fremap.c
index 5bff081..246a9c7 100644
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -207,11 +207,12 @@ get_write_lock:
@@ -207,12 +207,13 @@ get_write_lock:
*/
if (mapping_cap_account_dirty(mapping)) {
unsigned long addr;
- struct file *file = get_file(vma->vm_file);
+ struct file *file = vma->vm_file;
/* mmap_region may free vma; grab the info now */
vm_flags = vma->vm_flags;
+ vma_get_file(vma);
addr = mmap_region(file, start, size,
vma->vm_flags, pgoff);
addr = mmap_region(file, start, size, vm_flags, pgoff);
- fput(file);
+ vma_fput(vma);
if (IS_ERR_VALUE(addr)) {