luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] v4l: Check pad number in get try pointer functions

Browse Source 
Unify functions to get try pointers and validate the pad number accessed by
the user.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sakari Ailus 2012-02-15 22:57:22 -03:00 committed by Mauro Carvalho Chehab
parent c5a766ceb4
commit 5e6ff7c17b
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/media/v4l2-subdev.h
View File

@ -565,23 +565,19 @@ struct v4l2_subdev_fh {
container_of(fh, struct v4l2_subdev_fh, vfh) container_of(fh, struct v4l2_subdev_fh, vfh)
#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API) #if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
static inline struct v4l2_mbus_framefmt * #define __V4L2_SUBDEV_MK_GET_TRY(rtype, fun_name, field_name) \
v4l2_subdev_get_try_format(struct v4l2_subdev_fh *fh, unsigned int pad) static inline struct rtype * \
{ v4l2_subdev_get_try_##fun_name(struct v4l2_subdev_fh *fh, \
return &fh->pad[pad].try_fmt; unsigned int pad) \
} { \
BUG_ON(unlikely(pad >= vdev_to_v4l2_subdev( \
fh->vfh.vdev)->entity.num_pads)); \
return &fh->pad[pad].field_name; \
}
static inline struct v4l2_rect * __V4L2_SUBDEV_MK_GET_TRY(v4l2_mbus_framefmt, format, try_fmt)
v4l2_subdev_get_try_crop(struct v4l2_subdev_fh *fh, unsigned int pad) __V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, crop, try_compose)
{ __V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, compose, try_compose)
return &fh->pad[pad].try_crop;
}
static inline struct v4l2_rect *
v4l2_subdev_get_try_compose(struct v4l2_subdev_fh *fh, unsigned int pad)
{
return &fh->pad[pad].try_compose;
}
#endif #endif
extern const struct v4l2_file_operations v4l2_subdev_fops; extern const struct v4l2_file_operations v4l2_subdev_fops;