* [PATCH 2/2] [media] vb2-memops: Use bool macros instead of 1
2016-03-03 19:12 [PATCH 1/2] [media] vb2-memops: Fix over allocation of frame vectors Ricardo Ribalda Delgado
@ 2016-03-03 19:12 ` Ricardo Ribalda Delgado
2016-03-04 9:17 ` [PATCH 1/2] [media] vb2-memops: Fix over allocation of frame vectors Marek Szyprowski
2016-03-04 12:37 ` Jan Kara
2 siblings, 0 replies; 4+ messages in thread
From: Ricardo Ribalda Delgado @ 2016-03-03 19:12 UTC (permalink / raw)
To: albert, Jan Kara, Pawel Osciak, Marek Szyprowski, Kyungmin Park,
Hans Verkuil, Mauro Carvalho Chehab, linux-media, linux-kernel
Cc: Ricardo Ribalda Delgado
This is the prototype of the called function:
int get_vaddr_frames(unsigned long start, unsigned int nr_pfns,
bool write, bool force, struct frame_vector *vec);
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
drivers/media/v4l2-core/videobuf2-memops.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/v4l2-core/videobuf2-memops.c b/drivers/media/v4l2-core/videobuf2-memops.c
index e4e4976c6849..3c3b517f1d1c 100644
--- a/drivers/media/v4l2-core/videobuf2-memops.c
+++ b/drivers/media/v4l2-core/videobuf2-memops.c
@@ -49,7 +49,7 @@ struct frame_vector *vb2_create_framevec(unsigned long start,
vec = frame_vector_create(nr);
if (!vec)
return ERR_PTR(-ENOMEM);
- ret = get_vaddr_frames(start & PAGE_MASK, nr, write, 1, vec);
+ ret = get_vaddr_frames(start & PAGE_MASK, nr, write, true, vec);
if (ret < 0)
goto out_destroy;
/* We accept only complete set of PFNs */
--
2.7.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] [media] vb2-memops: Fix over allocation of frame vectors
2016-03-03 19:12 [PATCH 1/2] [media] vb2-memops: Fix over allocation of frame vectors Ricardo Ribalda Delgado
2016-03-03 19:12 ` [PATCH 2/2] [media] vb2-memops: Use bool macros instead of 1 Ricardo Ribalda Delgado
@ 2016-03-04 9:17 ` Marek Szyprowski
2016-03-04 12:37 ` Jan Kara
2 siblings, 0 replies; 4+ messages in thread
From: Marek Szyprowski @ 2016-03-04 9:17 UTC (permalink / raw)
To: Ricardo Ribalda Delgado, albert, Jan Kara, Pawel Osciak,
Kyungmin Park, Hans Verkuil, Mauro Carvalho Chehab, linux-media,
linux-kernel
Hello,
On 2016-03-03 20:12, Ricardo Ribalda Delgado wrote:
> On page unaligned frames, create_framevec forces get_vaddr_frames to
> allocate an extra page at the end of the buffer. Under some
> circumstances, this leads to -EINVAL on VIDIOC_QBUF.
>
> E.g:
> We have vm_a that vm_area that goes from 0x1000 to 0x3000. And a
> frame that goes from 0x1800 to 0x2800, i.e. 2 pages.
>
> frame_vector_create will be called with the following params:
>
> get_vaddr_frames(0x1800 , 2, write, 1, vec);
>
> get_vaddr will allocate the first page after checking that the memory
> 0x1800-0x27ff is valid, but it will not allocate the second page because
> the range 0x2800-0x37ff is out of the vm_a range. This results in
> create_framevec returning -EFAULT
>
> Error Trace:
> [ 9083.793015] video0: VIDIOC_QBUF: 00:00:00.00000000 index=1,
> type=vid-cap, flags=0x00002002, field=any, sequence=0,
> memory=userptr, bytesused=0, offset/userptr=0x7ff2b023ca80, length=5765760
> [ 9083.793028] timecode=00:00:00 type=0, flags=0x00000000,
> frames=0, userbits=0x00000000
> [ 9083.793117] video0: VIDIOC_QBUF: error -22: 00:00:00.00000000
> index=2, type=vid-cap, flags=0x00000000, field=any, sequence=0,
> memory=userptr, bytesused=0, offset/userptr=0x7ff2b07bc500, length=5765760
>
> Fixes: 21fb0cb7ec65 ("[media] vb2: Provide helpers for mapping virtual addresses")
> Reported-by: Albert Antony <albert@newtec.dk>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>
> Maybe we should cc stable.
>
> This error has not pop-out yet because userptr is usually called with memory
> on the heap and malloc usually overallocate. This error has been a pain to trace :).
>
> Regards!
>
>
>
> drivers/media/v4l2-core/videobuf2-memops.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/v4l2-core/videobuf2-memops.c b/drivers/media/v4l2-core/videobuf2-memops.c
> index dbec5923fcf0..e4e4976c6849 100644
> --- a/drivers/media/v4l2-core/videobuf2-memops.c
> +++ b/drivers/media/v4l2-core/videobuf2-memops.c
> @@ -49,7 +49,7 @@ struct frame_vector *vb2_create_framevec(unsigned long start,
> vec = frame_vector_create(nr);
> if (!vec)
> return ERR_PTR(-ENOMEM);
> - ret = get_vaddr_frames(start, nr, write, 1, vec);
> + ret = get_vaddr_frames(start & PAGE_MASK, nr, write, 1, vec);
> if (ret < 0)
> goto out_destroy;
> /* We accept only complete set of PFNs */
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] [media] vb2-memops: Fix over allocation of frame vectors
2016-03-03 19:12 [PATCH 1/2] [media] vb2-memops: Fix over allocation of frame vectors Ricardo Ribalda Delgado
2016-03-03 19:12 ` [PATCH 2/2] [media] vb2-memops: Use bool macros instead of 1 Ricardo Ribalda Delgado
2016-03-04 9:17 ` [PATCH 1/2] [media] vb2-memops: Fix over allocation of frame vectors Marek Szyprowski
@ 2016-03-04 12:37 ` Jan Kara
2 siblings, 0 replies; 4+ messages in thread
From: Jan Kara @ 2016-03-04 12:37 UTC (permalink / raw)
To: Ricardo Ribalda Delgado
Cc: albert, Jan Kara, Pawel Osciak, Marek Szyprowski, Kyungmin Park,
Hans Verkuil, Mauro Carvalho Chehab, linux-media, linux-kernel
On Thu 03-03-16 20:12:48, Ricardo Ribalda Delgado wrote:
> On page unaligned frames, create_framevec forces get_vaddr_frames to
> allocate an extra page at the end of the buffer. Under some
> circumstances, this leads to -EINVAL on VIDIOC_QBUF.
>
> E.g:
> We have vm_a that vm_area that goes from 0x1000 to 0x3000. And a
> frame that goes from 0x1800 to 0x2800, i.e. 2 pages.
>
> frame_vector_create will be called with the following params:
>
> get_vaddr_frames(0x1800 , 2, write, 1, vec);
>
> get_vaddr will allocate the first page after checking that the memory
> 0x1800-0x27ff is valid, but it will not allocate the second page because
> the range 0x2800-0x37ff is out of the vm_a range. This results in
> create_framevec returning -EFAULT
>
> Error Trace:
> [ 9083.793015] video0: VIDIOC_QBUF: 00:00:00.00000000 index=1,
> type=vid-cap, flags=0x00002002, field=any, sequence=0,
> memory=userptr, bytesused=0, offset/userptr=0x7ff2b023ca80, length=5765760
> [ 9083.793028] timecode=00:00:00 type=0, flags=0x00000000,
> frames=0, userbits=0x00000000
> [ 9083.793117] video0: VIDIOC_QBUF: error -22: 00:00:00.00000000
> index=2, type=vid-cap, flags=0x00000000, field=any, sequence=0,
> memory=userptr, bytesused=0, offset/userptr=0x7ff2b07bc500, length=5765760
>
> Fixes: 21fb0cb7ec65 ("[media] vb2: Provide helpers for mapping virtual addresses")
> Reported-by: Albert Antony <albert@newtec.dk>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
The patch looks good. Thanks for fixing this! You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
>
> Maybe we should cc stable.
>
> This error has not pop-out yet because userptr is usually called with memory
> on the heap and malloc usually overallocate. This error has been a pain to trace :).
>
> Regards!
>
>
>
> drivers/media/v4l2-core/videobuf2-memops.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/v4l2-core/videobuf2-memops.c b/drivers/media/v4l2-core/videobuf2-memops.c
> index dbec5923fcf0..e4e4976c6849 100644
> --- a/drivers/media/v4l2-core/videobuf2-memops.c
> +++ b/drivers/media/v4l2-core/videobuf2-memops.c
> @@ -49,7 +49,7 @@ struct frame_vector *vb2_create_framevec(unsigned long start,
> vec = frame_vector_create(nr);
> if (!vec)
> return ERR_PTR(-ENOMEM);
> - ret = get_vaddr_frames(start, nr, write, 1, vec);
> + ret = get_vaddr_frames(start & PAGE_MASK, nr, write, 1, vec);
> if (ret < 0)
> goto out_destroy;
> /* We accept only complete set of PFNs */
> --
> 2.7.0
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 4+ messages in thread