leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "mm: mmap: fix fput in error path v2"

Browse Source 
The kernel test robot is not happy with that.

This reverts commit 0227da01f2.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/394772/
This commit is contained in:
Christian König 2020-11-05 17:06:30 +01:00
parent e40b0b56ff
commit 2c16d29123
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/dma-buf/dma-buf.c
View File

@ -1166,6 +1166,9 @@ EXPORT_SYMBOL_GPL(dma_buf_end_cpu_access);
int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma, int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,
unsigned long pgoff) unsigned long pgoff)
{ {
struct file *oldfile;
int ret;
if (WARN_ON(!dmabuf || !vma)) if (WARN_ON(!dmabuf || !vma))
return -EINVAL; return -EINVAL;
@ -1183,11 +1186,22 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,
return -EINVAL; return -EINVAL;
/* readjust the vma */ /* readjust the vma */
fput(vma->vm_file); get_file(dmabuf->file);
vma->vm_file = get_file(dmabuf->file); oldfile = vma->vm_file;
vma->vm_file = dmabuf->file;
vma->vm_pgoff = pgoff; vma->vm_pgoff = pgoff;
return dmabuf->ops->mmap(dmabuf, vma); ret = dmabuf->ops->mmap(dmabuf, vma);
if (ret) {
/* restore old parameters on failure */
vma->vm_file = oldfile;
fput(dmabuf->file);
} else {
if (oldfile)
fput(oldfile);
}
return ret;
} }
EXPORT_SYMBOL_GPL(dma_buf_mmap); EXPORT_SYMBOL_GPL(dma_buf_mmap);

2
mm/mmap.c
View File

@ -1899,8 +1899,8 @@ out:
return addr; return addr;
unmap_and_free_vma: unmap_and_free_vma:
fput(vma->vm_file);
vma->vm_file = NULL; vma->vm_file = NULL;
fput(file);
/* Undo any partial mapping done by a device driver. */ /* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);