summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2015-03-31 08:02:14 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2015-04-05 23:54:55 +0200
commit2ca21002798a1a88196a90f407b80df3a25c69dc (patch)
tree4d471bf3d59542f186ba55d62724065c8bec7ec7 /drivers/nfc
parent6be88670fc59d50426f90f734a36b90e1de7d148 (diff)
downloadblackbird-obmc-linux-2ca21002798a1a88196a90f407b80df3a25c69dc.tar.gz
blackbird-obmc-linux-2ca21002798a1a88196a90f407b80df3a25c69dc.zip
NFC: st21nfcb: Fix memory leak in secure element probing stage
In case the hci session is successfully initialized we never release the nci_core_conn_create dest_params. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/st21nfcb/st21nfcb_se.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/nfc/st21nfcb/st21nfcb_se.c b/drivers/nfc/st21nfcb/st21nfcb_se.c
index 7c82e9d87a65..455b9c2b833d 100644
--- a/drivers/nfc/st21nfcb/st21nfcb_se.c
+++ b/drivers/nfc/st21nfcb/st21nfcb_se.c
@@ -542,14 +542,12 @@ static int st21nfcb_hci_network_init(struct nci_dev *ndev)
r = nci_hci_dev_session_init(ndev);
if (r != NCI_HCI_ANY_OK)
- goto exit;
+ goto free_dest_params;
r = nci_nfcee_mode_set(ndev, ndev->hci_dev->conn_info->id,
NCI_NFCEE_ENABLE);
if (r != NCI_STATUS_OK)
- goto exit;
-
- return 0;
+ goto free_dest_params;
free_dest_params:
kfree(dest_params);
OpenPOWER on IntegriCloud