lkml.org 
[lkml]   [2011]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[45/70] si4713-i2c: avoid potential buffer overflow on si4713
    2.6.39-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Mauro Carvalho Chehab <mchehab@redhat.com>

    commit dc6b845044ccb7e9e6f3b7e71bd179b3cf0223b6 upstream.

    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

    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Acked-by: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
    Acked-by: Eduardo Valentin <edubezval@gmail.com>
    Reviewed-by: Eugene Teo <eugeneteo@kernel.sg>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/media/radio/si4713-i2c.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/media/radio/si4713-i2c.c
    +++ b/drivers/media/radio/si4713-i2c.c
    @@ -1033,7 +1033,7 @@ static int si4713_write_econtrol_string(
    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(
    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;
    }

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-08-02 01:29    [W:0.023 / U:0.224 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site