Skip to content

Commit 3cb7215

Browse files
howlettgregkh
authored andcommitted
mm/mmap: fix __mmap_region() error handling in rare merge failure case
The mmap_region() function tries to install a new vma, which requires a pre-allocation for the maple tree write due to the complex locking scenarios involved. Recent efforts to simplify the error recovery required the relocation of the preallocation of the maple tree nodes (via vma_iter_prealloc() calling mas_preallocate()) higher in the function. The relocation of the preallocation meant that, if there was a file associated with the vma and the driver call (mmap_file()) modified the vma flags, then a new merge of the new vma with existing vmas is attempted. During the attempt to merge the existing vma with the new vma, the vma iterator is used - the same iterator that would be used for the next write attempt to the tree. In the event of needing a further allocation and if the new allocations fails, the vma iterator (and contained maple state) will cleaned up, including freeing all previous allocations and will be reset internally. Upon returning to the __mmap_region() function, the error is available in the vma_merge_struct and can be used to detect the -ENOMEM status. Hitting an -ENOMEM scenario after the driver callback leaves the system in a state that undoing the mapping is worse than continuing by dipping into the reserve. A preallocation should be performed in the case of an -ENOMEM and the allocations were lost during the failure scenario. The __GFP_NOFAIL flag is used in the allocation to ensure the allocation succeeds after implicitly telling the driver that the mapping was happening. The range is already set in the vma_iter_store() call below, so it is not necessary and is dropped. Reported-by: syzbot+bc6bfc25a68b7a020ee1@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/x/log.txt?x=17b0ace8580000 Fixes: 5de1950 ("mm: resolve faulty mmap_region() error path behaviour") Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com> Reviewed-by: Vlastimil Babka <vbabka@suse.cz> Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Cc: Jann Horn <jannh@google.com> Cc: <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1ee9d91 commit 3cb7215

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

mm/mmap.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,18 @@ static unsigned long __mmap_region(struct file *file, unsigned long addr,
14911491
vm_flags = vma->vm_flags;
14921492
goto file_expanded;
14931493
}
1494-
vma_iter_config(&vmi, addr, end);
1494+
1495+
/*
1496+
* In the unlikely even that more memory was needed, but
1497+
* not available for the vma merge, the vma iterator
1498+
* will have no memory reserved for the write we told
1499+
* the driver was happening. To keep up the ruse,
1500+
* ensure the allocation for the store succeeds.
1501+
*/
1502+
if (vmg_nomem(&vmg)) {
1503+
mas_preallocate(&vmi.mas, vma,
1504+
GFP_KERNEL|__GFP_NOFAIL);
1505+
}
14951506
}
14961507

14971508
vm_flags = vma->vm_flags;

0 commit comments

Comments
 (0)