[patch] Patch for aufs3 and hardened-sources-3.14.17-r1

aufs3-standalone-base-mmap-combined.patch.patch (text/plain), 1.80 KB, created by Andrea Zuccherelli on 2014-11-06 00:57:35 UTC

--- aufs3-standalone-base-mmap-combined.patch.orig	2014-10-17 22:29:51.000000000 +0200
+++ aufs3-standalone-base-mmap-combined.patch	2014-10-31 00:32:39.860051658 +0100
@@ -480,9 +480,9 @@
 +#define vmr_fput(region)		vmr_do_fput(region, __func__, __LINE__)
 +#endif /* CONFIG_MMU */
 +
- extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
- extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
- 		void *buf, int len, int write);
+ extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
+ extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
+ 		void *buf, size_t len, int write);
 only in patch2:
 unchanged:
 --- a/include/linux/mm_types.h
@@ -508,14 +508,14 @@
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
 @@ -412,7 +412,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
- 			struct inode *inode = file_inode(file);
- 			struct address_space *mapping = file->f_mapping;
+ 		struct inode *inode = file_inode(file);
+ 		struct address_space *mapping = file->f_mapping;
  
--			get_file(file);
-+			vma_get_file(tmp);
- 			if (tmp->vm_flags & VM_DENYWRITE)
- 				atomic_dec(&inode->i_writecount);
- 			mutex_lock(&mapping->i_mmap_mutex);
+-		get_file(file);
++		vma_get_file(tmp);
+ 		if (tmp->vm_flags & VM_DENYWRITE)
+ 			atomic_dec(&inode->i_writecount);
+ 		mutex_lock(&mapping->i_mmap_mutex);
 only in patch2:
 unchanged:
 --- a/mm/Makefile
@@ -665,9 +665,9 @@
  	if (new->vm_file)
 -		fput(new->vm_file);
 +		vma_fput(new);
- 	unlink_anon_vmas(new);
   out_free_mpol:
  	mpol_put(vma_policy(new));
+  out_free_vma:
 @@ -2837,7 +2837,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
  			if (anon_vma_clone(new_vma, vma))
  				goto out_free_mempol;