kernel-5.15.131

2023-09-11 14:56:18 +03:00
parent 367304898c
commit 12d14eee67
5 changed files with 210 additions and 193 deletions
@@ -179,7 +179,7 @@ index 00e391e75880..d8b52d814319 100644
 	if (page->mapping != mapping) {
 		unlock_page(page);
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 6bb553ed5c55..3f9d6d155171 100644
+index 6bb553ed5c55..44a7823a0de3 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
@@ -183,7 +183,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@@ -200,6 +200,15 @@ index 6bb553ed5c55..3f9d6d155171 100644
 		}
 		if (next->anon_vma)
 			anon_vma_merge(vma, next);
+@@ -1810,7 +1810,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+ 				 * fput the vma->vm_file here or we would add an extra fput for file
+ 				 * and cause general protection fault ultimately.
+ 				 */
+-				fput(vma->vm_file);
+				vma_fput(vma);
+ 				vm_area_free(vma);
+ 				vma = merge;
+ 				/* Update vm_flags to pick up the change. */
@@ -1873,7 +1873,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 	return addr;
 
@@ -253,7 +262,7 @@ index 6bb553ed5c55..3f9d6d155171 100644
 +		new_vma = find_vma(mm, ret);
 +		if (!new_vma->vm_prfile)
 +			new_vma->vm_prfile = prfile;
-+		if (new_vma != vma)
+		if (prfile)
 +			get_file(prfile);
 +	}
 +	/*