shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 584739f5dd.

Upstream has reworked the copy to/from user logic for the v4l drivers,
fixing loads of compatibility issues.  To be copying "reserved" fields
from the v4l structures seems like a big userspace violation, and as
such, the new logic does not allow that.

If vendors still require this for their out-of-tree drivers, they can
resubmit this patch in the correct format, after discussing it with
upstream about if this is allowed or not.

Bug: 143160749
Cc: Maheshwar Ajja <majja@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I58fab8345114bf951eb202e39303544ae71b50b7
This commit is contained in:
Greg Kroah-Hartman
2020-12-15 13:30:57 +01:00
parent c48541cee1
commit 39cbc3ab24
2 changed files with 3 additions and 15 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,11 +465,6 @@ struct v4l2_plane32 {
__s32 fd; __s32 fd;
} m; } m;
__u32 data_offset; __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]; __u32 reserved[11];
}; };
@@ -534,9 +529,7 @@ static int get_v4l2_plane32(struct v4l2_plane __user *p64,
if (copy_in_user(p64, p32, 2 * sizeof(__u32)) || if (copy_in_user(p64, p32, 2 * sizeof(__u32)) ||
copy_in_user(&p64->data_offset, &p32->data_offset, 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; return -EFAULT;
switch (memory) { switch (memory) {
@@ -568,9 +561,7 @@ static int put_v4l2_plane32(struct v4l2_plane __user *p64,
if (copy_in_user(p32, p64, 2 * sizeof(__u32)) || if (copy_in_user(p32, p64, 2 * sizeof(__u32)) ||
copy_in_user(&p32->data_offset, &p64->data_offset, 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; return -EFAULT;
switch (memory) { switch (memory) {

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

@@ -978,9 +978,7 @@ struct v4l2_requestbuffers {
* descriptor associated with this plane * descriptor associated with this plane
* @data_offset: offset in the plane to the start of data; usually 0, * @data_offset: offset in the plane to the start of data; usually 0,
* unless there is a header in front of the data * 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 * 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 * 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 * components. Each plane can reside in a separate memory buffer, or even in
@@ -995,7 +993,6 @@ struct v4l2_plane {
__s32 fd; __s32 fd;
} m; } m;
__u32 data_offset; __u32 data_offset;
/* reserved fields used by few userspace clients and drivers */
__u32 reserved[11]; __u32 reserved[11];
}; };