media: vicodec: fix out-of-range values when decoding

While decoding you need to make sure you do not get values < 0
or > 255. Note that since this code will also be used in userspace
utilities the clamp macro isn't used since that is kernel-only.

Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

diff --git a/drivers/media/platform/vicodec/codec-fwht.c b/drivers/media/platform/vicodec/codec-fwht.c
index f91f90f7e5fc33eb02e4401ac93da862e383747f..47939160560ebf4fadf5415155f253df75097d9f 100644 (file)
--- a/drivers/media/platform/vicodec/codec-fwht.c
+++ b/drivers/media/platform/vicodec/codec-fwht.c
@@ -625,8 +625,14 @@ static void fill_decoder_block(u8 *dst, const s16 *input, int stride)
        int i, j;
 
        for (i = 0; i < 8; i++) {
-               for (j = 0; j < 8; j++)
-                       *dst++ = *input++;
+               for (j = 0; j < 8; j++, input++, dst++) {
+                       if (*input < 0)
+                               *dst = 0;
+                       else if (*input > 255)
+                               *dst = 255;
+                       else
+                               *dst = *input;
+               }
                dst += stride - 8;
        }
 }