OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
400fc13
)
st21nfca_connectivity_event_received: null check the allocation
author
Navid Emamdoost
<navid.emamdoost@gmail.com>
Tue, 23 Jul 2019 22:04:30 +0000
(17:04 -0500)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 6 Sep 2019 08:19:32 +0000
(10:19 +0200)
[ 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>
drivers/nfc/st21nfca/se.c
patch
|
blob
|
history
diff --git
a/drivers/nfc/st21nfca/se.c
b/drivers/nfc/st21nfca/se.c
index
3a98563
..
eac608a
100644
(file)
--- a/
drivers/nfc/st21nfca/se.c
+++ b/
drivers/nfc/st21nfca/se.c
@@
-326,6
+326,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],