summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorNavid Emamdoost <navid.emamdoost@gmail.com>2019-07-23 17:11:51 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-29 08:28:31 +0200
commitc5cb10632c0fb4a4a4f7782e87e40aa6257bff9b (patch)
treef22e5a1167e70fd2439059dab9621dddf01313da /drivers/nfc
parent0d73ba88f466b65a3c6877cc2cd16383a5548cba (diff)
downloadlinux-stable-c5cb10632c0fb4a4a4f7782e87e40aa6257bff9b.tar.gz
linux-stable-c5cb10632c0fb4a4a4f7782e87e40aa6257bff9b.tar.bz2
linux-stable-c5cb10632c0fb4a4a4f7782e87e40aa6257bff9b.zip
st_nci_hci_connectivity_event_received: null check the allocation
[ Upstream commit 3008e06fdf0973770370f97d5f1fba3701d8281d ] 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/st-nci/se.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c
index f55d082ace71..5d6e7e931bc6 100644
--- a/drivers/nfc/st-nci/se.c
+++ b/drivers/nfc/st-nci/se.c
@@ -344,6 +344,8 @@ static int st_nci_hci_connectivity_event_received(struct nci_dev *ndev,
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], transaction->aid_len);