From: Christophe Ricard <christophe.ricard@gmail.com>
Date: Wed, 19 Aug 2015 19:26:42 +0000 (+0200)
Subject: nfc: nci: hci: Add check on skb nci_hci_send_cmd parameter
X-Git-Tag: v4.1.9~158
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4fbdb442390e3eeb755d299c3dcbc777ea83f193;p=users%2Fjedix%2Flinux-maple.git

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

commit 5a9e0ffc0f128ecdf7c770f76c268e4f9f3c9118 upstream.

skb can be NULL and may lead to a NULL pointer error.

Add a check condition before setting HCI rx buffer.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/nfc/nci/hci.c b/net/nfc/nci/hci.c
index ed54ec5338363..b33fed6d15841 100644
--- 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;