| From 58e7dcc9ca29c14e44267a4d0ea61e3229124907 Mon Sep 17 00:00:00 2001 |
| From: Ziyang Xuan <william.xuanziyang@huawei.com> |
| Date: Wed, 13 Oct 2021 15:50:12 +0800 |
| Subject: NFC: digital: fix possible memory leak in digital_tg_listen_mdaa() |
| |
| From: Ziyang Xuan <william.xuanziyang@huawei.com> |
| |
| commit 58e7dcc9ca29c14e44267a4d0ea61e3229124907 upstream. |
| |
| 'params' is allocated in digital_tg_listen_mdaa(), but not free when |
| digital_send_cmd() failed, which will cause memory leak. Fix it by |
| freeing 'params' if digital_send_cmd() return failed. |
| |
| Fixes: 1c7a4c24fbfd ("NFC Digital: Add target NFC-DEP support") |
| Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> |
| Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/nfc/digital_core.c | 9 +++++++-- |
| 1 file changed, 7 insertions(+), 2 deletions(-) |
| |
| --- a/net/nfc/digital_core.c |
| +++ b/net/nfc/digital_core.c |
| @@ -277,6 +277,7 @@ int digital_tg_configure_hw(struct nfc_d |
| static int digital_tg_listen_mdaa(struct nfc_digital_dev *ddev, u8 rf_tech) |
| { |
| struct digital_tg_mdaa_params *params; |
| + int rc; |
| |
| params = kzalloc(sizeof(*params), GFP_KERNEL); |
| if (!params) |
| @@ -291,8 +292,12 @@ static int digital_tg_listen_mdaa(struct |
| get_random_bytes(params->nfcid2 + 2, NFC_NFCID2_MAXSIZE - 2); |
| params->sc = DIGITAL_SENSF_FELICA_SC; |
| |
| - return digital_send_cmd(ddev, DIGITAL_CMD_TG_LISTEN_MDAA, NULL, params, |
| - 500, digital_tg_recv_atr_req, NULL); |
| + rc = digital_send_cmd(ddev, DIGITAL_CMD_TG_LISTEN_MDAA, NULL, params, |
| + 500, digital_tg_recv_atr_req, NULL); |
| + if (rc) |
| + kfree(params); |
| + |
| + return rc; |
| } |
| |
| static int digital_tg_listen_md(struct nfc_digital_dev *ddev, u8 rf_tech) |
