diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-19 03:53:36 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-20 16:35:53 -0400 |
commit | a46c5fbc6912c4e34cb7ded314249b639dc244a6 (patch) | |
tree | bc247e83bf5da2c0c89dae099e1a75361c9d1ec7 /drivers/media | |
parent | 3d58ffe2aa107df6db57f875dba5368960b17cde (diff) |
V4L/DVB (5869): Add check for valid control ID to v4l2_ctrl_next.
If v4l2_ctrl_next is called without the V4L2_CTRL_FLAG_NEXT_CTRL then it
should check whether the passed control ID is valid and return 0 if it
isn't. Otherwise a for-loop over the control IDs will never end.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/v4l2-common.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index 13ee550d3215..d2915d3530ea 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c | |||
@@ -939,16 +939,25 @@ int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qc | |||
939 | When no more controls are available 0 is returned. */ | 939 | When no more controls are available 0 is returned. */ |
940 | u32 v4l2_ctrl_next(const u32 * const * ctrl_classes, u32 id) | 940 | u32 v4l2_ctrl_next(const u32 * const * ctrl_classes, u32 id) |
941 | { | 941 | { |
942 | u32 ctrl_class; | 942 | u32 ctrl_class = V4L2_CTRL_ID2CLASS(id); |
943 | const u32 *pctrl; | 943 | const u32 *pctrl; |
944 | 944 | ||
945 | /* if no query is desired, then just return the control ID */ | ||
946 | if ((id & V4L2_CTRL_FLAG_NEXT_CTRL) == 0) | ||
947 | return id; | ||
948 | if (ctrl_classes == NULL) | 945 | if (ctrl_classes == NULL) |
949 | return 0; | 946 | return 0; |
947 | |||
948 | /* if no query is desired, then check if the ID is part of ctrl_classes */ | ||
949 | if ((id & V4L2_CTRL_FLAG_NEXT_CTRL) == 0) { | ||
950 | /* find class */ | ||
951 | while (*ctrl_classes && V4L2_CTRL_ID2CLASS(**ctrl_classes) != ctrl_class) | ||
952 | ctrl_classes++; | ||
953 | if (*ctrl_classes == NULL) | ||
954 | return 0; | ||
955 | pctrl = *ctrl_classes; | ||
956 | /* find control ID */ | ||
957 | while (*pctrl && *pctrl != id) pctrl++; | ||
958 | return *pctrl ? id : 0; | ||
959 | } | ||
950 | id &= V4L2_CTRL_ID_MASK; | 960 | id &= V4L2_CTRL_ID_MASK; |
951 | ctrl_class = V4L2_CTRL_ID2CLASS(id); | ||
952 | id++; /* select next control */ | 961 | id++; /* select next control */ |
953 | /* find first class that matches (or is greater than) the class of | 962 | /* find first class that matches (or is greater than) the class of |
954 | the ID */ | 963 | the ID */ |