Commit cbcc5072 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'fix-two-possible-memory-leak-problems-in-nfc-digital-module' 

Ziyang Xuan says:

====================
Fix two possible memory leak problems in NFC digital module.
====================

Link: https://lore.kernel.org/r/cover.1634111083.git.william.xuanziyang@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0911ab31 291c932f

net/nfc/digital_core.c

+7 −2
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ int digital_tg_configure_hw(struct nfc_digital_dev *ddev, int type, int param) 
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 nfc_digital_dev *ddev, u8 rf_tech) 
	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,

	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)

net/nfc/digital_technology.c

+6 −2
Original line number Diff line number Diff line
@@ -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,

	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,