CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap
Subsystems (2)
PATCH 1/1 CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap
From: John Sheu <[email protected]>
Callers to dma_buf_mmap expect to fput() the vma struct's vm_file themselves on failure. Not restoring the struct's data on failure causes a double-decrement of the vm_file's refcount.
--- drivers/base/dma-buf.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)
drivers/base/dma-buf.c +15 -6
@@ -536,6 +536,9 @@ EXPORT_SYMBOL_GPL(dma_buf_kunmap);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 ;
@@ -549,15 +552,21 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,return -EINVAL ;/* readjust the vma */ -if (vma->vm_file) -fput (vma->vm_file); - +get_file (dmabuf->file); + oldfile = vma->vm_file; vma->vm_file = dmabuf->file; -get_file (vma->vm_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);
Signature · 1 line
1.7.8.6
+dri-devel ML
Quoted 59 lines · On 12 February 2013 07:20, <[email protected]> wrote:
From: John Sheu <[email protected]>
Callers to
dma_buf_mmapexpect tofput()the vma struct'svm_filethemselves on failure. Not restoring the struct's data on failure causes a double-decrement of the vm_file's refcount.Signed-off-by John Sheu <[email protected]>--- drivers/base/dma-buf.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)drivers/base/dma-buf.c +15
-7@@ -536,6 +536,9 @@ EXPORT_SYMBOL_GPL(dma_buf_kunmap);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 ;@@ -549,15 +552,21 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma, return -EINVAL ;/* readjust the vma */ -if (vma->vm_file) -fput (vma->vm_file); - +get_file (dmabuf->file); + oldfile = vma->vm_file; vma->vm_file = dmabuf->file; -get_file (vma->vm_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); --1.7.8.6
Signature · 12 lines
Thanks and regards, Sumit Semwal Linaro Kernel Engineer - Graphics working group Linaro.org <http://www.linaro.org/>* **│ *Open source software for ARM SoCs* *** Follow *Linaro: *Facebook <http://www.facebook.com/pages/Linaro> | Twitter<http://twitter.com/#!/linaroorg> | Blog <http://www.linaro.org/linaro-blog/>
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
+dri-devel ML
Quoted 76 lines · On 12 February 2013 07:20, <[email protected]> wrote:
Quoted 57 lines
From: John Sheu <[email protected]>
Callers to
dma_buf_mmapexpect tofput()the vma struct'svm_filethemselves on failure. Not restoring the struct's data on failure causes a double-decrement of the vm_file's refcount.Signed-off-by John Sheu <[email protected]>--- drivers/base/dma-buf.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)drivers/base/dma-buf.c +15
-7@@ -536,6 +536,9 @@ EXPORT_SYMBOL_GPL(dma_buf_kunmap);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 ;@@ -549,15 +552,21 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma, return -EINVAL ;/* readjust the vma */ -if (vma->vm_file) -fput (vma->vm_file); - +get_file (dmabuf->file); + oldfile = vma->vm_file; vma->vm_file = dmabuf->file; -get_file (vma->vm_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); --Quoted 2 lines
1.7.8.6
--
Thanks and regards,
Sumit Semwal
Linaro Kernel Engineer - Graphics working group
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Signature · 9 lines
Thanks and regards, Sumit Semwal Linaro Kernel Engineer - Graphics working group Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Quoted 7 lines · On Tue, Feb 12, 2013 at 2:50 AM, <[email protected]> wrote:
From: John Sheu <[email protected]>
Callers to
dma_buf_mmapexpect tofput()the vma struct'svm_filethemselves on failure. Not restoring the struct's data on failure causes a double-decrement of the vm_file's refcount.Signed-off-by John Sheu <[email protected]>
Yeah, makes sense that this little helper here cleans up any damage it caused when the callback fails.
Quoted 55 lines
--- drivers/base/dma-buf.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)drivers/base/dma-buf.c +15
-7@@ -536,6 +536,9 @@ EXPORT_SYMBOL_GPL(dma_buf_kunmap);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 ;@@ -549,15 +552,21 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,return -EINVAL ;/* readjust the vma */ -if (vma->vm_file) -fput (vma->vm_file); - +get_file (dmabuf->file); + oldfile = vma->vm_file; vma->vm_file = dmabuf->file; -get_file (vma->vm_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); --1.7.8.6
_______________________________________________
Linaro-mm-sig mailing list
[email protected]
http://lists.linaro.org/mailman/listinfo/linaro-mm-sig
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 7 lines · Daniel Vetter
Quoted 6 lines · On Tue, Feb 12, 2013 at 2:50 AM, <[email protected]> wrote:
From: John Sheu <[email protected]>
Callers to
dma_buf_mmapexpect tofput()the vma struct'svm_filethemselves on failure. Not restoring the struct's data on failure causes a double-decrement of the vm_file's refcount.
Quoted 6 lines
Quoted 1 line
Signed-off-by John Sheu <[email protected]>Yeah, makes sense that this little helper here cleans up any damage it caused when the callback fails.
Reviewed-by Daniel Vetter <[email protected]>
Thanks John, Daniel!
I'll pull it in the for-next soon.
Best regards,
~Sumit.
Quoted 62 lines
Quoted 51 lines
--- drivers/base/dma-buf.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)drivers/base/dma-buf.c +15
-7@@ -536,6 +536,9 @@ EXPORT_SYMBOL_GPL(dma_buf_kunmap);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 ;@@ -549,15 +552,21 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,return -EINVAL ;/* readjust the vma */ -if (vma->vm_file) -fput (vma->vm_file); - +get_file (dmabuf->file); + oldfile = vma->vm_file; vma->vm_file = dmabuf->file; -get_file (vma->vm_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); --1.7.8.6
Quoted 4 lines
_______________________________________________
Linaro-mm-sig mailing list
[email protected]
http://lists.linaro.org/mailman/listinfo/linaro-mm-sig--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
Signature · 9 lines
Thanks and regards, Sumit Semwal Linaro Kernel Engineer - Graphics working group Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog