lkml.org 
[lkml]   [2014]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 077/143] isdnloop: use strlcpy() instead of strcpy()
    2.6.32-longterm review patch.  If anyone has any objections, please let me know.

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

    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit f9a23c84486ed350cce7bb1b2828abd1f6658796 ]

    These strings come from a copy_from_user() and there is no way to be
    sure they are NUL terminated.

    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    drivers/isdn/isdnloop/isdnloop.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
    index 22446f7..92d895f 100644
    --- a/drivers/isdn/isdnloop/isdnloop.c
    +++ b/drivers/isdn/isdnloop/isdnloop.c
    @@ -1082,8 +1082,10 @@ isdnloop_start(isdnloop_card * card, isdnloop_sdef * sdefp)
    spin_unlock_irqrestore(&card->isdnloop_lock, flags);
    return -ENOMEM;
    }
    - for (i = 0; i < 3; i++)
    - strcpy(card->s0num[i], sdef.num[i]);
    + for (i = 0; i < 3; i++) {
    + strlcpy(card->s0num[i], sdef.num[i],
    + sizeof(card->s0num[0]));
    + }
    break;
    case ISDN_PTYPE_1TR6:
    if (isdnloop_fake(card, "DRV1.04TC-1TR6-CAPI-CNS-BASIS-29.11.95",
    @@ -1096,7 +1098,7 @@ isdnloop_start(isdnloop_card * card, isdnloop_sdef * sdefp)
    spin_unlock_irqrestore(&card->isdnloop_lock, flags);
    return -ENOMEM;
    }
    - strcpy(card->s0num[0], sdef.num[0]);
    + strlcpy(card->s0num[0], sdef.num[0], sizeof(card->s0num[0]));
    card->s0num[1][0] = '\0';
    card->s0num[2][0] = '\0';
    break;
    --
    1.7.12.2.21.g234cd45.dirty




    \
     
     \ /
      Last update: 2014-05-12 04:41    [W:2.606 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site