forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: v4l2-compat-ioctl32.c: copy reserved fields

Browse source 
Copy reserved fields along with other fields in v4l2_plane
for userspace clients and drivers to use reserved fields
when required.

Bug: 143160749
Change-Id: I0c7e7485961ab50188cda6ae81998473500bb07b
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
This commit is contained in:
Maheshwar Ajja 2019-10-24 13:08:09 -07:00 • committed by Todd Kjos
commit 584739f5dd
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/media/v4l2-core/v4l2-compat-ioctl32.c
View file

@ -465,6 +465,11 @@ struct v4l2_plane32 {
__s32 fd;
} m;
__u32 data_offset;
/*
* few userspace clients and drivers use reserved fields
* and it is up to them how these fields are used. v4l2
* simply copy reserved fields between them.
*/
__u32 reserved[11];
};
@ -499,7 +504,9 @@ static int get_v4l2_plane32(struct v4l2_plane __user *p64,
if (copy_in_user(p64, p32, 2 * sizeof(__u32)) ||
copy_in_user(&p64->data_offset, &p32->data_offset,
sizeof(p64->data_offset)))
sizeof(p64->data_offset)) ||
copy_in_user(p64->reserved, p32->reserved,
sizeof(p64->reserved)))
return -EFAULT;
switch (memory) {
@ -531,7 +538,9 @@ static int put_v4l2_plane32(struct v4l2_plane __user *p64,
if (copy_in_user(p32, p64, 2 * sizeof(__u32)) ||
copy_in_user(&p32->data_offset, &p64->data_offset,
sizeof(p64->data_offset)))
sizeof(p64->data_offset)) ||
copy_in_user(p32->reserved, p64->reserved,
sizeof(p32->reserved)))
return -EFAULT;
switch (memory) {

5
include/uapi/linux/videodev2.h
View file

@ -935,7 +935,9 @@ struct v4l2_requestbuffers {
* descriptor associated with this plane
* @data_offset: offset in the plane to the start of data; usually 0,
* unless there is a header in front of the data
*
* @reserved: few userspace clients and drivers use reserved fields
* and it is up to them how these fields are used. v4l2
* simply copy reserved fields between them.
* Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer
* with two planes can have one plane for Y, and another for interleaved CbCr
* components. Each plane can reside in a separate memory buffer, or even in
@ -950,6 +952,7 @@ struct v4l2_plane {
__s32 fd;
} m;
__u32 data_offset;
/* reserved fields used by few userspace clients and drivers */
__u32 reserved[11];
};