leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfc: nci: hci: Add check on skb nci_hci_send_cmd parameter

Browse Source 
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>
This commit is contained in:
Christophe Ricard
2015-08-19 21:26:42 +02:00
committed by Samuel Ortiz
parent c04c674fad
commit 5a9e0ffc0f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/nfc/nci/hci.c
View File

@@ -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, r = nci_request(ndev, nci_hci_send_data_req, (unsigned long)&data,
msecs_to_jiffies(NCI_DATA_TIMEOUT)); msecs_to_jiffies(NCI_DATA_TIMEOUT));
if (r == NCI_STATUS_OK) if (r == NCI_STATUS_OK && skb)
*skb = conn_info->rx_skb; *skb = conn_info->rx_skb;
return r; return r;