lkml.org 
[lkml]   [2007]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 09/36] isdn: avoid copying overly-long strings
    2.6.22-stable review patch.  If anyone has any objections, please let us
    know.

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

    From: Karsten Keil <kkeil@suse.de>

    patch 0f13864e5b24d9cbe18d125d41bfa4b726a82e40 in mainline.

    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=9416

    Signed-off-by: Karsten Keil <kkeil@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/isdn/i4l/isdn_net.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/isdn/i4l/isdn_net.c
    +++ b/drivers/isdn/i4l/isdn_net.c
    @@ -2126,7 +2126,7 @@ isdn_net_find_icall(int di, int ch, int
    u_long flags;
    isdn_net_dev *p;
    isdn_net_phone *n;
    - char nr[32];
    + char nr[ISDN_MSNLEN];
    char *my_eaz;

    /* Search name in netdev-chain */
    @@ -2135,7 +2135,7 @@ isdn_net_find_icall(int di, int ch, int
    nr[1] = '\0';
    printk(KERN_INFO "isdn_net: Incoming call without OAD, assuming '0'\n");
    } else
    - strcpy(nr, setup->phone);
    + strlcpy(nr, setup->phone, ISDN_MSNLEN);
    si1 = (int) setup->si1;
    si2 = (int) setup->si2;
    if (!setup->eazmsn[0]) {
    @@ -2802,7 +2802,7 @@ isdn_net_setcfg(isdn_net_ioctl_cfg * cfg
    chidx = -1;
    }
    }
    - strcpy(lp->msn, cfg->eaz);
    + strlcpy(lp->msn, cfg->eaz, sizeof(lp->msn));
    lp->pre_device = drvidx;
    lp->pre_channel = chidx;
    lp->onhtime = cfg->onhtime;
    @@ -2951,7 +2951,7 @@ isdn_net_addphone(isdn_net_ioctl_phone *
    if (p) {
    if (!(n = kmalloc(sizeof(isdn_net_phone), GFP_KERNEL)))
    return -ENOMEM;
    - strcpy(n->num, phone->phone);
    + strlcpy(n->num, phone->phone, sizeof(n->num));
    n->next = p->local->phone[phone->outgoing & 1];
    p->local->phone[phone->outgoing & 1] = n;
    return 0;
    --


    \
     
     \ /
      Last update: 2007-12-13 07:43    [W:0.028 / U:60.884 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site