[stable] Patch Upstream: si4713-i2c: avoid potential buffer overflow on si4713

[James Bottomley]

commit: dc6b845044ccb7e9e6f3b7e71bd179b3cf0223b6
From: Mauro Carvalho Chehab <mche...@redhat.com>
Date: Sun, 17 Jul 2011 00:24:37 -0300
Subject: [PATCH] si4713-i2c: avoid potential buffer overflow on si4713
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While compiling it with Fedora 15, I noticed this issue:

  inlined from ‘si4713_write_econtrol_string’ at 
drivers/media/radio/si4713-i2c.c:1065:24:
  arch/x86/include/asm/uaccess_32.h:211:26: error: call to 
‘copy_from_user_overflow’ declared with attribute error: copy_from_user() 
buffer size is not provably correct

Cc: sta...@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
Acked-by: Sakari Ailus <sakari.ai...@maxwell.research.nokia.com>
Acked-by: Eduardo Valentin <edubez...@gmail.com>
Reviewed-by: Eugene Teo <eugene...@kernel.sg>
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
---
 drivers/media/radio/si4713-i2c.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c
index deca2e0..c9f4a8e 100644
--- a/drivers/media/radio/si4713-i2c.c
+++ b/drivers/media/radio/si4713-i2c.c
@@ -1033,7 +1033,7 @@ static int si4713_write_econtrol_string(struct 
si4713_device *sdev,
                char ps_name[MAX_RDS_PS_NAME + 1];
 
                len = control->size - 1;
-               if (len > MAX_RDS_PS_NAME) {
+               if (len < 0 || len > MAX_RDS_PS_NAME) {
                        rval = -ERANGE;
                        goto exit;
                }
@@ -1057,7 +1057,7 @@ static int si4713_write_econtrol_string(struct 
si4713_device *sdev,
                char radio_text[MAX_RDS_RADIO_TEXT + 1];
 
                len = control->size - 1;
-               if (len > MAX_RDS_RADIO_TEXT) {
+               if (len < 0 || len > MAX_RDS_RADIO_TEXT) {
                        rval = -ERANGE;
                        goto exit;
                }


_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable