2004-06-06 16:26:05

by Yury Umanets

Subject: [PATCH] 2.6.6 memory allocation checks in drivers/media/video/v4l1-compat.c

Various memory allocation checks in drivers/media/video/v4l1-compat.c

./linux-2.6.6-modified/drivers/media/video/v4l1-compat.c | 17
+++++++++++++++
1 files changed, 17 insertions(+)

Signed-off-by: Yury Umanets <[email protected]>

diff -rupN ./linux-2.6.6/drivers/media/video/v4l1-compat.c
./linux-2.6.6-modified/drivers/media/video/v4l1-compat.c
--- ./linux-2.6.6/drivers/media/video/v4l1-compat.c Mon May 10 05:32:38
2004
+++ ./linux-2.6.6-modified/drivers/media/video/v4l1-compat.c Wed Jun 2
14:27:21 2004
@@ -308,6 +308,9 @@ v4l_compat_translate_ioctl(struct inode
struct video_capability *cap = arg;

cap2 = kmalloc(sizeof(*cap2),GFP_KERNEL);
+ if (!cap2)
+ return -ENOMEM;
+
memset(cap, 0, sizeof(*cap));
memset(cap2, 0, sizeof(*cap2));
memset(&fbuf2, 0, sizeof(fbuf2));
@@ -425,6 +428,8 @@ v4l_compat_translate_ioctl(struct inode
struct video_window *win = arg;

fmt2 = kmalloc(sizeof(*fmt2),GFP_KERNEL);
+ if (!fmt2)
+ return -ENOMEM;
memset(win,0,sizeof(*win));
memset(fmt2,0,sizeof(*fmt2));

@@ -464,6 +469,8 @@ v4l_compat_translate_ioctl(struct inode
int err1,err2;

fmt2 = kmalloc(sizeof(*fmt2),GFP_KERNEL);
+ if (!fmt2)
+ return -ENOMEM;
memset(fmt2,0,sizeof(*fmt2));
fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
drv(inode, file, VIDIOC_STREAMOFF, &fmt2->type);
@@ -598,6 +605,8 @@ v4l_compat_translate_ioctl(struct inode
V4L2_CID_WHITENESS, drv);

fmt2 = kmalloc(sizeof(*fmt2),GFP_KERNEL);
+ if (!fmt2)
+ return -ENOMEM;
memset(fmt2,0,sizeof(*fmt2));
fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
err = drv(inode, file, VIDIOC_G_FMT, fmt2);
@@ -628,6 +637,8 @@ v4l_compat_translate_ioctl(struct inode
V4L2_CID_WHITENESS, pict->whiteness, drv);

fmt2 = kmalloc(sizeof(*fmt2),GFP_KERNEL);
+ if (!fmt2)
+ return -ENOMEM;
memset(fmt2,0,sizeof(*fmt2));
fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
err = drv(inode, file, VIDIOC_G_FMT, fmt2);
@@ -861,6 +872,8 @@ v4l_compat_translate_ioctl(struct inode
struct video_mmap *mm = arg;

fmt2 = kmalloc(sizeof(*fmt2),GFP_KERNEL);
+ if (!fmt2)
+ return -ENOMEM;
memset(&buf2,0,sizeof(buf2));
memset(fmt2,0,sizeof(*fmt2));

@@ -957,6 +970,8 @@ v4l_compat_translate_ioctl(struct inode
struct vbi_format *fmt = arg;

fmt2 = kmalloc(sizeof(*fmt2),GFP_KERNEL);
+ if (!fmt2)
+ return -ENOMEM;
memset(fmt2, 0, sizeof(*fmt2));
fmt2->type = V4L2_BUF_TYPE_VBI_CAPTURE;

@@ -981,6 +996,8 @@ v4l_compat_translate_ioctl(struct inode
struct vbi_format *fmt = arg;

fmt2 = kmalloc(sizeof(*fmt2),GFP_KERNEL);
+ if (!fmt2)
+ return -ENOMEM;
memset(fmt2, 0, sizeof(*fmt2));

fmt2->type = V4L2_BUF_TYPE_VBI_CAPTURE;

--
umka