lkml.org 
[lkml]   [2015]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2.6.32 39/62] cx24116: fix a buffer overflow when checking userspace params
    2.6.32-longterm review patch.  If anyone has any objections, please let me know.

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

    From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

    commit 1fa2337a315a2448c5434f41e00d56b01a22283c upstream.

    The maximum size for a DiSEqC command is 6, according to the
    userspace API. However, the code allows to write up much more values:
    drivers/media/dvb-frontends/cx24116.c:983 cx24116_send_diseqc_msg() error: buffer overflow 'd->msg' 6 <= 23

    Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
    [bwh: Backported to 3.2: adjust filename]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    (cherry picked from commit 729c8c5e3700410e3436573abfa5b68e8d3c89d6)

    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    drivers/media/dvb/frontends/cx24116.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c
    index 2410d8b..b7d4847 100644
    --- a/drivers/media/dvb/frontends/cx24116.c
    +++ b/drivers/media/dvb/frontends/cx24116.c
    @@ -950,6 +950,10 @@ static int cx24116_send_diseqc_msg(struct dvb_frontend *fe,
    struct cx24116_state *state = fe->demodulator_priv;
    int i, ret;

    + /* Validate length */
    + if (d->msg_len > sizeof(d->msg))
    + return -EINVAL;
    +
    /* Dump DiSEqC message */
    if (debug) {
    printk(KERN_INFO "cx24116: %s(", __func__);
    @@ -961,10 +965,6 @@ static int cx24116_send_diseqc_msg(struct dvb_frontend *fe,
    printk(") toneburst=%d\n", toneburst);
    }

    - /* Validate length */
    - if (d->msg_len > (CX24116_ARGLEN - CX24116_DISEQC_MSGOFS))
    - return -EINVAL;
    -
    /* DiSEqC message */
    for (i = 0; i < d->msg_len; i++)
    state->dsec_cmd.args[CX24116_DISEQC_MSGOFS + i] = d->msg[i];
    --
    1.7.12.2.21.g234cd45.dirty




    \
     
     \ /
      Last update: 2015-09-13 01:41    [W:4.325 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site