| From 5a9e0ffc0f128ecdf7c770f76c268e4f9f3c9118 Mon Sep 17 00:00:00 2001 |
| From: Christophe Ricard <christophe.ricard@gmail.com> |
| Date: Wed, 19 Aug 2015 21:26:42 +0200 |
| Subject: nfc: nci: hci: Add check on skb nci_hci_send_cmd parameter |
| |
| From: Christophe Ricard <christophe.ricard@gmail.com> |
| |
| 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> |
| |
| --- |
| net/nfc/nci/hci.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/nfc/nci/hci.c |
| +++ b/net/nfc/nci/hci.c |
| @@ -233,7 +233,7 @@ int nci_hci_send_cmd(struct nci_dev *nde |
| 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; |
