Commit 32898a14 authored by Xi Wang's avatar Xi Wang Committed by Mauro Carvalho Chehab

[media] zoran: fix integer overflow in setup_window()

`clipcount' is from userspace and thus needs validation.  Otherwise,
a large `clipcount' could overflow the vmalloc() size, leading to
out-of-bounds access.

| setup_window()
| zoran_s_fmt_vid_overlay()
| __video_do_ioctl()
| video_ioctl2()

Use 2048 as the maximum `clipcount'.  Also change the corresponding
parameter type to `unsigned int'.
Signed-off-by: default avatarXi Wang <xi.wang@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3fc82fa0
...@@ -1131,8 +1131,14 @@ static int setup_fbuffer(struct zoran_fh *fh, ...@@ -1131,8 +1131,14 @@ static int setup_fbuffer(struct zoran_fh *fh,
} }
static int setup_window(struct zoran_fh *fh, int x, int y, int width, int height, static int setup_window(struct zoran_fh *fh,
struct v4l2_clip __user *clips, int clipcount, void __user *bitmap) int x,
int y,
int width,
int height,
struct v4l2_clip __user *clips,
unsigned int clipcount,
void __user *bitmap)
{ {
struct zoran *zr = fh->zr; struct zoran *zr = fh->zr;
struct v4l2_clip *vcp = NULL; struct v4l2_clip *vcp = NULL;
...@@ -1155,6 +1161,14 @@ static int setup_window(struct zoran_fh *fh, int x, int y, int width, int height ...@@ -1155,6 +1161,14 @@ static int setup_window(struct zoran_fh *fh, int x, int y, int width, int height
return -EINVAL; return -EINVAL;
} }
if (clipcount > 2048) {
dprintk(1,
KERN_ERR
"%s: %s - invalid clipcount\n",
ZR_DEVNAME(zr), __func__);
return -EINVAL;
}
/* /*
* The video front end needs 4-byte alinged line sizes, we correct that * The video front end needs 4-byte alinged line sizes, we correct that
* silently here if necessary * silently here if necessary
...@@ -1218,7 +1232,7 @@ static int setup_window(struct zoran_fh *fh, int x, int y, int width, int height ...@@ -1218,7 +1232,7 @@ static int setup_window(struct zoran_fh *fh, int x, int y, int width, int height
(width * height + 7) / 8)) { (width * height + 7) / 8)) {
return -EFAULT; return -EFAULT;
} }
} else if (clipcount > 0) { } else if (clipcount) {
/* write our own bitmap from the clips */ /* write our own bitmap from the clips */
vcp = vmalloc(sizeof(struct v4l2_clip) * (clipcount + 4)); vcp = vmalloc(sizeof(struct v4l2_clip) * (clipcount + 4));
if (vcp == NULL) { if (vcp == NULL) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment