Commit 5a9e0ffc authored Aug 19, 2015 by Christophe Ricard Committed by Samuel Ortiz Aug 20, 2015

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



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>

parent c04c674f

net/nfc/nci/hci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;