lkml.org 
[lkml]   [2012]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] staging: vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl()
    If copy_to_user() fails in the WLAN_CMD_GET_NODE_LIST case of the
    switch in drivers/staging/vt6656/ioctl.c::private_ioctl() we'll leak
    the memory allocated to 'pNodeList'. Fix that by kfree'ing the memory
    in the failure case.
    Also remove a pointless cast (to type 'PSNodeList') of a kmalloc()
    return value - kmalloc() returns a void pointer that is implicitly
    converted, so there is no need for an explicit cast.

    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    ---
    drivers/staging/vt6656/ioctl.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c
    index 1463d76..d59456c 100644
    --- a/drivers/staging/vt6656/ioctl.c
    +++ b/drivers/staging/vt6656/ioctl.c
    @@ -565,7 +565,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
    result = -ENOMEM;
    break;
    }
    - pNodeList = (PSNodeList)kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), (int)GFP_ATOMIC);
    + pNodeList = kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), (int)GFP_ATOMIC);
    if (pNodeList == NULL) {
    result = -ENOMEM;
    break;
    @@ -601,6 +601,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
    }
    }
    if (copy_to_user(pReq->data, pNodeList, sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)))) {
    + kfree(pNodeList);
    result = -EFAULT;
    break;
    }
    --
    1.7.10

    --
    Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
    Don't top-post http://www.catb.org/jargon/html/T/top-post.html
    Plain text mails only, please.



    \
     
     \ /
      Last update: 2012-04-12 00:37    [W:0.026 / U:0.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site