From 03d777f511d5820441ae2f3584e7441dd019faea Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Tue, 16 Jun 2009 18:14:49 -0700 Subject: v4l2: Fix flaw in alignment code From: Trent Piepho It's possible that the height alignment would be increased beyond the maximum possible value when trying to satisfy size alignment. Please fold with b4d3ec8d363d v4l2: Create helper function for bounding and aligning images Priority: high Signed-off-by: Trent Piepho --- linux/drivers/media/video/v4l2-common.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'linux/drivers') diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c index ba3790a98..f94b5d92a 100644 --- a/linux/drivers/media/video/v4l2-common.c +++ b/linux/drivers/media/video/v4l2-common.c @@ -1055,10 +1055,13 @@ void v4l_bound_align_image(u32 *w, unsigned int wmin, unsigned int wmax, if (walign + halign < salign) { /* Max walign where there is still a valid width */ unsigned int wmaxa = __fls(wmax ^ (wmin - 1)); + /* Max halign where there is still a valid height */ + unsigned int hmaxa = __fls(hmax ^ (hmin - 1)); /* up the smaller alignment until we have enough */ do { - if (walign <= halign && walign < wmaxa) { + if (halign >= hmaxa || + (walign <= halign && walign < wmaxa)) { *w = clamp_align(*w, wmin, wmax, walign + 1); walign = __ffs(*w); } else { -- cgit v1.2.3