lkml.org 
[lkml]   [2012]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 46/56] NFC: pn533: Fix mem leak in pn533_in_dep_link_up
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>

    commit 70418e6efcf4f8652cc08e3f2ab8ae35f0948fd9 upstream.

    cmd is allocated in pn533_dep_link_up and passed as an arg to
    pn533_send_cmd_frame_async together with a complete cb.

    arg is passed to the cb and must be kfreed there.

    Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/nfc/pn533.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- a/drivers/nfc/pn533.c
    +++ b/drivers/nfc/pn533.c
    @@ -1278,11 +1278,14 @@ static void pn533_deactivate_target(stru
    static int pn533_in_dep_link_up_complete(struct pn533 *dev, void *arg,
    u8 *params, int params_len)
    {
    - struct pn533_cmd_jump_dep *cmd;
    struct pn533_cmd_jump_dep_response *resp;
    struct nfc_target nfc_target;
    u8 target_gt_len;
    int rc;
    + struct pn533_cmd_jump_dep *cmd = (struct pn533_cmd_jump_dep *)arg;
    + u8 active = cmd->active;
    +
    + kfree(arg);

    if (params_len == -ENOENT) {
    nfc_dev_dbg(&dev->interface->dev, "");
    @@ -1304,7 +1307,6 @@ static int pn533_in_dep_link_up_complete
    }

    resp = (struct pn533_cmd_jump_dep_response *) params;
    - cmd = (struct pn533_cmd_jump_dep *) arg;
    rc = resp->status & PN533_CMD_RET_MASK;
    if (rc != PN533_CMD_RET_SUCCESS) {
    nfc_dev_err(&dev->interface->dev,
    @@ -1334,7 +1336,7 @@ static int pn533_in_dep_link_up_complete
    if (rc == 0)
    rc = nfc_dep_link_is_up(dev->nfc_dev,
    dev->nfc_dev->targets[0].idx,
    - !cmd->active, NFC_RF_INITIATOR);
    + !active, NFC_RF_INITIATOR);

    return 0;
    }



    \
     
     \ /
      Last update: 2012-11-30 20:41    [W:6.245 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site