media: adv7604: Prevent out of bounds access
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 4 Aug 2017 08:07:51 +0000 (04:07 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 9 Aug 2017 14:35:15 +0000 (10:35 -0400)
These can only be accessed with CAP_SYS_ADMIN so it's not a critical
security issue.  The problem is that "page" is controlled by the user in
the ioctl().  The test to see if the bit is set in state->info->page_mask
is not sufficient because "page" can be very high and shift wrap around
to a bit which is set.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/i2c/adv7604.c

index 324d39bd68d0af1edfbd89a358994cc8184fd57d..f289b8aca1da818599aabe9fc277e8d6af667f56 100644 (file)
@@ -618,7 +618,7 @@ static int adv76xx_read_reg(struct v4l2_subdev *sd, unsigned int reg)
        unsigned int val;
        int err;
 
-       if (!(BIT(page) & state->info->page_mask))
+       if (page >= ADV76XX_PAGE_MAX || !(BIT(page) & state->info->page_mask))
                return -EINVAL;
 
        reg &= 0xff;
@@ -633,7 +633,7 @@ static int adv76xx_write_reg(struct v4l2_subdev *sd, unsigned int reg, u8 val)
        struct adv76xx_state *state = to_state(sd);
        unsigned int page = reg >> 8;
 
-       if (!(BIT(page) & state->info->page_mask))
+       if (page >= ADV76XX_PAGE_MAX || !(BIT(page) & state->info->page_mask))
                return -EINVAL;
 
        reg &= 0xff;