[Hardy CVE-2011-0521] [media] [v3,media] av7110: check for negative array offset, CVE-2011-0521

[Leann Ogasawara]

The following changes since commit 62419a42fd4f8a418e90ca0d474eae77c138152e:
  Tim Gardner (1):
        UBUNTU: [Config] remove generated files

are available in the git repository at:

  git://kernel.ubuntu.com/ogasawara/ubuntu-hardy.git CVE-2011-0521

Dan Carpenter (1):
      [media] [v3,media] av7110: check for negative array offset, CVE-2011-0521

 drivers/media/dvb/ttpci/av7110_ca.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

>From 28700f242783963aa5025036050fb3a2f50c51d1 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27 at gmail.com>
Date: Fri, 7 Jan 2011 16:41:54 -0300
Subject: [PATCH] [media] [v3,media] av7110: check for negative array offset, CVE-2011-0521

BugLink: http://bugs.launchpad.net/bugs/767526

CVE-2011-0521

info->num comes from the user.  It's type int.  If the user passes
in a negative value that would cause memory corruption.

Signed-off-by: Dan Carpenter <error27 at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
(cherry picked from commit cb26a24ee9706473f31d34cc259f4dcf45cd0644)

Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
---
 drivers/media/dvb/ttpci/av7110_ca.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c
index c58e3fc..1e89adc 100644
--- a/drivers/media/dvb/ttpci/av7110_ca.c
+++ b/drivers/media/dvb/ttpci/av7110_ca.c
@@ -277,7 +277,7 @@ static int dvb_ca_ioctl(struct inode *inode, struct file *file,
 	{
 		ca_slot_info_t *info=(ca_slot_info_t *)parg;
 
-		if (info->num > 1)
+		if (info->num < 0 || info->num > 1)
 			return -EINVAL;
 		av7110->ci_slot[info->num].num = info->num;
 		av7110->ci_slot[info->num].type = FW_CI_LL_SUPPORT(av7110->arm_app) ?
-- 
1.7.0.4