Message ID | 56fbe3414c94916d197a1a1b3e438eaa129d5c9f.1634111083.git.william.xuanziyang@huawei.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 291c932fc3692e4d211a445ba8aa35663831bac7 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | fix two possible memory leak problems in NFC digital module | expand |
On 13/10/2021 09:50, Ziyang Xuan wrote: > 'skb' is allocated in digital_in_send_sdd_req(), but not free when > digital_in_send_cmd() failed, which will cause memory leak. Fix it > by freeing 'skb' if digital_in_send_cmd() return failed. > > Fixes: 2c66daecc409 ("NFC Digital: Add NFC-A technology support") > Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> > --- > net/nfc/digital_technology.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Best regards, Krzysztof
diff --git a/net/nfc/digital_technology.c b/net/nfc/digital_technology.c index 84d2345c75a3..3adf4589852a 100644 --- a/net/nfc/digital_technology.c +++ b/net/nfc/digital_technology.c @@ -465,8 +465,12 @@ static int digital_in_send_sdd_req(struct nfc_digital_dev *ddev, skb_put_u8(skb, sel_cmd); skb_put_u8(skb, DIGITAL_SDD_REQ_SEL_PAR); - return digital_in_send_cmd(ddev, skb, 30, digital_in_recv_sdd_res, - target); + rc = digital_in_send_cmd(ddev, skb, 30, digital_in_recv_sdd_res, + target); + if (rc) + kfree_skb(skb); + + return rc; } static void digital_in_recv_sens_res(struct nfc_digital_dev *ddev, void *arg,
'skb' is allocated in digital_in_send_sdd_req(), but not free when digital_in_send_cmd() failed, which will cause memory leak. Fix it by freeing 'skb' if digital_in_send_cmd() return failed. Fixes: 2c66daecc409 ("NFC Digital: Add NFC-A technology support") Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> --- net/nfc/digital_technology.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)