summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorNavid Emamdoost <navid.emamdoost@gmail.com>2019-07-23 17:04:30 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-29 08:28:31 +0200
commit0d73ba88f466b65a3c6877cc2cd16383a5548cba (patch)
treec5f86d5f6268f6924c18bf2b90c223c39a62c750 /drivers/nfc
parent714a8438fc8ae88aa22c25065e241bce0260db13 (diff)
downloadlinux-stable-0d73ba88f466b65a3c6877cc2cd16383a5548cba.tar.gz
linux-stable-0d73ba88f466b65a3c6877cc2cd16383a5548cba.tar.bz2
linux-stable-0d73ba88f466b65a3c6877cc2cd16383a5548cba.zip
st21nfca_connectivity_event_received: null check the allocation
[ Upstream commit 9891d06836e67324c9e9c4675ed90fc8b8110034 ] devm_kzalloc may fail and return null. So the null check is needed. Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/nfc')
-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 4bed9e842db3..fd967a38a94a 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],