lkml.org 
[lkml]   [2011]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[057/143] Staging: rtl8192su: check for skb == NULL
    2.6.32-longterm review patch.  If anyone has any objections, please let us know.

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

    From: Florian Schilhabel <florian.c.schilhabel@googlemail.com>

    commit 199ef62a287b429a8fa3b7dc5ae6b69f607bf324 upstream.

    added 2 checks for skb == NULL.
    plus cosmetics

    Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    [bwh: Remove cosmetic changes]
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/staging/rtl8192su/r8192S_firmware.c | 5 +++++
    drivers/staging/rtl8192su/r819xU_cmdpkt.c | 6 ++++++
    2 files changed, 11 insertions(+)

    --- a/drivers/staging/rtl8192su/r8192S_firmware.c
    +++ b/drivers/staging/rtl8192su/r8192S_firmware.c
    @@ -68,6 +68,11 @@ bool FirmwareDownloadCode(struct net_dev

    /* Allocate skb buffer to contain firmware info and tx descriptor info. */
    skb = dev_alloc_skb(frag_length);
    + if (skb == NULL) {
    + RT_TRACE(COMP_ERR, "(%s): unable to alloc skb buffer\n",
    + __func__);
    + goto cmdsend_downloadcode_fail;
    + }
    memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));

    tcb_desc = (cb_desc*)(skb->cb + MAX_DEV_ADDR_SIZE);
    --- a/drivers/staging/rtl8192su/r819xU_cmdpkt.c
    +++ b/drivers/staging/rtl8192su/r819xU_cmdpkt.c
    @@ -56,6 +56,12 @@ SendTxCommandPacket(

    //Get TCB and local buffer from common pool. (It is shared by CmdQ, MgntQ, and USB coalesce DataQ)
    skb = dev_alloc_skb(USB_HWDESC_HEADER_LEN + DataLen + 4);
    + if (skb == NULL) {
    + RT_TRACE(COMP_ERR, "(%s): unable to alloc skb buffer\n",
    + __func__);
    + rtStatus = false;
    + return rtStatus;
    + }
    memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));
    tcb_desc = (cb_desc*)(skb->cb + MAX_DEV_ADDR_SIZE);
    tcb_desc->queue_index = TXCMD_QUEUE;



    \
     
     \ /
      Last update: 2011-05-06 02:57    [W:2.906 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site