lkml.org 
[lkml]   [2009]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 5/9] Fix incorrect stable backport to bas_gigaset
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

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

    From: Tilman Schmidt <tilman@imap.cc>

    bas_gigaset: correctly allocate USB interrupt transfer buffer

    [ Upstream commit 170ebf85160dd128e1c4206cc197cce7d1424705 ]

    This incorrect backport to 2.6.28.10 placed some code into the probe function
    which used a pointer before it was initialized. Moving this to the correct
    place (as it is in upstream).

    Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
    Acked-by: Tim Gardner <tim.gardner@canonical.com>
    Acked-by: Steve Conklin <steve.conklin@canonical.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/isdn/gigaset/bas-gigaset.c | 16 +++++++++-------
    1 file changed, 9 insertions(+), 7 deletions(-)

    --- a/drivers/isdn/gigaset/bas-gigaset.c
    +++ b/drivers/isdn/gigaset/bas-gigaset.c
    @@ -2140,8 +2140,16 @@ static int gigaset_initcshw(struct cards
    struct bas_cardstate *ucs;

    cs->hw.bas = ucs = kmalloc(sizeof *ucs, GFP_KERNEL);
    - if (!ucs)
    + if (!ucs) {
    + pr_err("out of memory\n");
    + return 0;
    + }
    + ucs->int_in_buf = kmalloc(IP_MSGSIZE, GFP_KERNEL);
    + if (!ucs->int_in_buf) {
    + kfree(ucs);
    + pr_err("out of memory\n");
    return 0;
    + }

    ucs->urb_cmd_in = NULL;
    ucs->urb_cmd_out = NULL;
    @@ -2236,12 +2244,6 @@ static int gigaset_probe(struct usb_inte
    }
    hostif = interface->cur_altsetting;
    }
    - ucs->int_in_buf = kmalloc(IP_MSGSIZE, GFP_KERNEL);
    - if (!ucs->int_in_buf) {
    - kfree(ucs);
    - pr_err("out of memory\n");
    - return 0;
    - }

    /* Reject application specific interfaces
    */



    \
     
     \ /
      Last update: 2009-10-02 01:27    [W:0.033 / U:60.120 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site