diff options
| author | Christian König <christian.koenig@amd.com> | 2020-10-09 15:08:55 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2020-11-05 13:03:43 +0100 |
| commit | 0227da01f2559626396af5f6c7453360db86c1f6 (patch) | |
| tree | 4bd2c28e4a1de36378eb7a45be3e81b52318f043 /mm/mmap.c | |
| parent | ea86f3defd55f141a44146e66cbf8ffb683d60da (diff) | |
| download | linux-0227da01f2559626396af5f6c7453360db86c1f6.tar.gz linux-0227da01f2559626396af5f6c7453360db86c1f6.tar.bz2 linux-0227da01f2559626396af5f6c7453360db86c1f6.zip | |
mm: mmap: fix fput in error path v2
Patch "495c10cc1c0c CHROMIUM: dma-buf: restore args..."
adds a workaround for a bug in mmap_region.
As the comment states ->mmap() callback can change
vma->vm_file and so we might call fput() on the wrong file.
Revert the workaround and proper fix this in mmap_region.
v2: drop the extra if in dma_buf_mmap as well
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/394772/
Diffstat (limited to 'mm/mmap.c')
| -rw-r--r-- | mm/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index d91ecb00d38c..30a4e8412a58 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1899,8 +1899,8 @@ out: return addr; unmap_and_free_vma: + fput(vma->vm_file); vma->vm_file = NULL; - fput(file); /* Undo any partial mapping done by a device driver. */ unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); |