diff options
| author |   Christian König <christian.koenig@amd.com> | 2020-11-05 17:06:30 +0100 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2020-11-05 17:09:18 +0100 |
| commit | 2c16d291236b50f4af83dcdc687ee405c22ad0d3 (patch) | |
| tree | 3be1a80fa8a66c2f263a4f7ab7cbc65a0ac0b5ac | |
| parent | Revert "mm: introduce vma_set_file function v4" (diff) | |
| download | linux-dev-2c16d291236b50f4af83dcdc687ee405c22ad0d3.tar.xz linux-dev-2c16d291236b50f4af83dcdc687ee405c22ad0d3.zip | |
Revert "mm: mmap: fix fput in error path v2"
The kernel test robot is not happy with that.
This reverts commit 0227da01f2559626396af5f6c7453360db86c1f6.
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/394772/
| -rw-r--r-- | drivers/dma-buf/dma-buf.c | 20 | ||||
| -rw-r--r-- | mm/mmap.c | 2 |
2 files changed, 18 insertions, 4 deletions
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 282bd8b84170..0eb80c1ecdab 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -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, unsigned long pgoff) { + struct file *oldfile; + int ret; + if (WARN_ON(!dmabuf || !vma)) return -EINVAL; @@ -1183,11 +1186,22 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma, return -EINVAL; /* readjust the vma */ - fput(vma->vm_file); - vma->vm_file = get_file(dmabuf->file); + get_file(dmabuf->file); + oldfile = vma->vm_file; + vma->vm_file = dmabuf->file; 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); diff --git a/mm/mmap.c b/mm/mmap.c index 30a4e8412a58..d91ecb00d38c 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); |