diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-08-21 16:49:16 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-09-03 10:35:56 -0300 |
commit | eadf9e26fab7f9841adcc36f3559dbce7604fcd5 (patch) | |
tree | 9f8e06b88a7421ab1b574d839a60cc151d167c40 /include/uapi/linux/videodev2.h | |
parent | 4a9e512afa31fc1af2a93467aa4363db97f815b5 (diff) | |
download | op-kernel-dev-eadf9e26fab7f9841adcc36f3559dbce7604fcd5.zip op-kernel-dev-eadf9e26fab7f9841adcc36f3559dbce7604fcd5.tar.gz |
[media] videodev2.h: add __user to v4l2_ext_control pointers
These are not copied to kernel space by video_usercopy, so mark them
as __user.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/uapi/linux/videodev2.h')
-rw-r--r-- | include/uapi/linux/videodev2.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 778a329..0b1ba5c 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -1285,11 +1285,11 @@ struct v4l2_ext_control { union { __s32 value; __s64 value64; - char *string; - __u8 *p_u8; - __u16 *p_u16; - __u32 *p_u32; - void *ptr; + char __user *string; + __u8 __user *p_u8; + __u16 __user *p_u16; + __u32 __user *p_u32; + void __user *ptr; }; } __attribute__ ((packed)); |