From: Szymon Janc <[email protected]> cmd was freed in pn533_dep_link_up regardless of pn533_send_cmd_frame_async return code. Cmd is passed as argument to pn533_in_dep_link_up_complete callback and should be freed there.
Signed-off-by: Szymon Janc <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]> Cc: <[email protected]> # 3.6.x Cc: <[email protected]> # 3.4.x Upstream-ID: 770f750bc2b8312489c8e45306f551d08a319d3c Stable-Trees: 3.6 3.4 Signed-off-by: Peter Huewe <[email protected]> --- Submitted for inclusion in stable drivers/nfc/pn533.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c index cb6204f..eeb0d59 100644 --- a/drivers/nfc/pn533.c +++ b/drivers/nfc/pn533.c @@ -1385,12 +1385,8 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, int target_idx, rc = pn533_send_cmd_frame_async(dev, dev->out_frame, dev->in_frame, dev->in_maxlen, pn533_in_dep_link_up_complete, cmd, GFP_KERNEL); - if (rc) - goto out; - - -out: - kfree(cmd); + if (rc < 0) + kfree(cmd); return rc; } -- 1.7.8.6 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
