aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2018-03-24 10:44:58 -0300
committerSamuel Ortiz <sameo@linux.intel.com>2018-06-04 06:25:50 +0200
commit6a893401a728236d9bec0575d73527992ca7929c (patch)
tree4c3c9f2fa330df62212b20c9b6599eb7cd6cd356
parente530d198bdbfe59b5c99ee48287e81f893326731 (diff)
downloadnfc-next-6a893401a728236d9bec0575d73527992ca7929c.tar.gz
nfc: st21nfca: Check for devm_kzalloc() failure
devm_kzalloc() may fail, so we should better check for error and propagate the error in the case of allocation failure. This avoids a potential NULL pointer dereference later on. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/nfc/st21nfca/se.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nfc/st21nfca/se.c b/drivers/nfc/st21nfca/se.c
index 4bed9e842db38..fd967a38a94a5 100644
--- a/drivers/nfc/st21nfca/se.c
+++ b/drivers/nfc/st21nfca/se.c
@@ -328,6 +328,8 @@ int st21nfca_connectivity_event_received(struct nfc_hci_dev *hdev, u8 host,
transaction = (struct nfc_evt_transaction *)devm_kzalloc(dev,
skb->len - 2, GFP_KERNEL);
+ if (!transaction)
+ return -ENOMEM;
transaction->aid_len = skb->data[1];
memcpy(transaction->aid, &skb->data[2],