* [PATCH v2] dma-buf: use vma_pages().
@ 2016-05-23 11:38 ` Muhammad Falak R Wani
0 siblings, 0 replies; 5+ messages in thread
From: Muhammad Falak R Wani @ 2016-05-23 11:38 UTC (permalink / raw)
To: Sumit Semwal
Cc: Eric Engestrom, open list:DMA BUFFER SHARING FRAMEWORK,
open list:DMA BUFFER SHARING FRAMEWORK,
moderated list:DMA BUFFER SHARING FRAMEWORK, open list
Replace explicit computation of vma page count by a call to
vma_pages().
Also, include <linux/mm.h>
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
drivers/dma-buf/dma-buf.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 4a2c07e..6355ab3 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -33,6 +33,7 @@
#include <linux/seq_file.h>
#include <linux/poll.h>
#include <linux/reservation.h>
+#include <linux/mm.h>
#include <uapi/linux/dma-buf.h>
@@ -90,7 +91,7 @@ static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma)
dmabuf = file->private_data;
/* check for overflowing the buffer's size */
- if (vma->vm_pgoff + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) >
+ if (vma->vm_pgoff + vma_pages(vma) >
dmabuf->size >> PAGE_SHIFT)
return -EINVAL;
@@ -723,11 +724,11 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,
return -EINVAL;
/* check for offset overflow */
- if (pgoff + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) < pgoff)
+ if (pgoff + vma_pages(vma) < pgoff)
return -EOVERFLOW;
/* check for overflowing the buffer's size */
- if (pgoff + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) >
+ if (pgoff + vma_pages(vma) >
dmabuf->size >> PAGE_SHIFT)
return -EINVAL;
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2] dma-buf: use vma_pages().
@ 2016-05-23 11:38 ` Muhammad Falak R Wani
0 siblings, 0 replies; 5+ messages in thread
From: Muhammad Falak R Wani @ 2016-05-23 11:38 UTC (permalink / raw)
To: Sumit Semwal
Cc: Eric Engestrom, open list:DMA BUFFER SHARING FRAMEWORK,
open list:DMA BUFFER SHARING FRAMEWORK,
moderated list:DMA BUFFER SHARING FRAMEWORK, open list
Replace explicit computation of vma page count by a call to
vma_pages().
Also, include <linux/mm.h>
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
drivers/dma-buf/dma-buf.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 4a2c07e..6355ab3 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -33,6 +33,7 @@
#include <linux/seq_file.h>
#include <linux/poll.h>
#include <linux/reservation.h>
+#include <linux/mm.h>
#include <uapi/linux/dma-buf.h>
@@ -90,7 +91,7 @@ static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma)
dmabuf = file->private_data;
/* check for overflowing the buffer's size */
- if (vma->vm_pgoff + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) >
+ if (vma->vm_pgoff + vma_pages(vma) >
dmabuf->size >> PAGE_SHIFT)
return -EINVAL;
@@ -723,11 +724,11 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,
return -EINVAL;
/* check for offset overflow */
- if (pgoff + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) < pgoff)
+ if (pgoff + vma_pages(vma) < pgoff)
return -EOVERFLOW;
/* check for overflowing the buffer's size */
- if (pgoff + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) >
+ if (pgoff + vma_pages(vma) >
dmabuf->size >> PAGE_SHIFT)
return -EINVAL;
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] dma-buf: use vma_pages().
2016-05-23 11:38 ` Muhammad Falak R Wani
(?)
@ 2016-05-23 12:44 ` Eric Engestrom
-1 siblings, 0 replies; 5+ messages in thread
From: Eric Engestrom @ 2016-05-23 12:44 UTC (permalink / raw)
To: Muhammad Falak R Wani
Cc: Sumit Semwal, open list:DMA BUFFER SHARING FRAMEWORK,
open list:DMA BUFFER SHARING FRAMEWORK,
moderated list:DMA BUFFER SHARING FRAMEWORK, open list
On Mon, May 23, 2016 at 05:08:42PM +0530, Muhammad Falak R Wani wrote:
> Replace explicit computation of vma page count by a call to
> vma_pages().
> Also, include <linux/mm.h>
All good!
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] dma-buf: use vma_pages().
@ 2016-05-23 12:44 ` Eric Engestrom
0 siblings, 0 replies; 5+ messages in thread
From: Eric Engestrom @ 2016-05-23 12:44 UTC (permalink / raw)
To: Muhammad Falak R Wani
Cc: Sumit Semwal, open list:DMA BUFFER SHARING FRAMEWORK,
open list:DMA BUFFER SHARING FRAMEWORK,
moderated list:DMA BUFFER SHARING FRAMEWORK, open list
On Mon, May 23, 2016 at 05:08:42PM +0530, Muhammad Falak R Wani wrote:
> Replace explicit computation of vma page count by a call to
> vma_pages().
> Also, include <linux/mm.h>
All good!
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] dma-buf: use vma_pages().
@ 2016-05-23 12:44 ` Eric Engestrom
0 siblings, 0 replies; 5+ messages in thread
From: Eric Engestrom @ 2016-05-23 12:44 UTC (permalink / raw)
To: Muhammad Falak R Wani
Cc: moderated list:DMA BUFFER SHARING FRAMEWORK, open list,
open list:DMA BUFFER SHARING FRAMEWORK,
open list:DMA BUFFER SHARING FRAMEWORK
On Mon, May 23, 2016 at 05:08:42PM +0530, Muhammad Falak R Wani wrote:
> Replace explicit computation of vma page count by a call to
> vma_pages().
> Also, include <linux/mm.h>
All good!
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-05-23 12:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-23 11:38 [PATCH v2] dma-buf: use vma_pages() Muhammad Falak R Wani
2016-05-23 11:38 ` Muhammad Falak R Wani
2016-05-23 12:44 ` Eric Engestrom
2016-05-23 12:44 ` Eric Engestrom
2016-05-23 12:44 ` Eric Engestrom
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.