OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c04c674
)
nfc: nci: hci: Add check on skb nci_hci_send_cmd parameter
author
Christophe Ricard
<christophe.ricard@gmail.com>
Wed, 19 Aug 2015 19:26:42 +0000
(21:26 +0200)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Thu, 20 Aug 2015 19:56:36 +0000
(21:56 +0200)
skb can be NULL and may lead to a NULL pointer error.
Add a check condition before setting HCI rx buffer.
Cc: stable@vger.kernel.org
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
net/nfc/nci/hci.c
patch
|
blob
|
history
diff --git
a/net/nfc/nci/hci.c
b/net/nfc/nci/hci.c
index
af002df
..
609f922
100644
(file)
--- a/
net/nfc/nci/hci.c
+++ b/
net/nfc/nci/hci.c
@@
-233,7
+233,7
@@
int nci_hci_send_cmd(struct nci_dev *ndev, u8 gate, u8 cmd,
r = nci_request(ndev, nci_hci_send_data_req, (unsigned long)&data,
msecs_to_jiffies(NCI_DATA_TIMEOUT));
- if (r == NCI_STATUS_OK)
+ if (r == NCI_STATUS_OK
&& skb
)
*skb = conn_info->rx_skb;
return r;