Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecc6522b authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz
Browse files

NFC: st21nfca: Fix potential skb leaks in NFC-DEP code 



After a unsuccessful call to nfc_hci_send_event the skb was not
freed and might lead to memory leak.

Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent cc3faac9

drivers/nfc/st21nfca/st21nfca_dep.c

+9 −2
Original line number Diff line number Diff line
@@ -185,8 +185,10 @@ static int st21nfca_tm_send_atr_res(struct nfc_hci_dev *hdev, 


	info->dep_info.curr_nfc_dep_pni = 0;



	return nfc_hci_send_event(hdev, ST21NFCA_RF_CARD_F_GATE,

	r = nfc_hci_send_event(hdev, ST21NFCA_RF_CARD_F_GATE,

				ST21NFCA_EVT_SEND_DATA, skb->data, skb->len);

	kfree_skb(skb);

	return r;

}



static int st21nfca_tm_recv_atr_req(struct nfc_hci_dev *hdev,
@@ -254,6 +256,8 @@ static int st21nfca_tm_send_psl_res(struct nfc_hci_dev *hdev, 


	r = nfc_hci_send_event(hdev, ST21NFCA_RF_CARD_F_GATE,

				ST21NFCA_EVT_SEND_DATA, skb->data, skb->len);

	if (r < 0)

		goto error;



	/*

	 * ST21NFCA only support P2P passive.
@@ -269,8 +273,11 @@ static int st21nfca_tm_send_psl_res(struct nfc_hci_dev *hdev, 
	}



	/* Send an event to change bitrate change event to card f */

	return nfc_hci_send_event(hdev, ST21NFCA_RF_CARD_F_GATE,

	r = nfc_hci_send_event(hdev, ST21NFCA_RF_CARD_F_GATE,

			ST21NFCA_EVT_CARD_F_BITRATE, bitrate, 2);

error:

	kfree_skb(skb);

	return r;

}



static int st21nfca_tm_recv_psl_req(struct nfc_hci_dev *hdev,