This is a note to let you know that I've just added the patch titled nfc: nci: hci: Add check on skb nci_hci_send_cmd parameter to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: nfc-nci-hci-add-check-on-skb-nci_hci_send_cmd-parameter.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 5a9e0ffc0f128ecdf7c770f76c268e4f9f3c9118 Mon Sep 17 00:00:00 2001 From: Christophe Ricard <christophe.ricard@xxxxxxxxx> 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@xxxxxxxxx> 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@xxxxxx> Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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; Patches currently in stable-queue which might be from christophe.ricard@xxxxxxxxx are queue-4.1/nfc-nci-hci-add-check-on-skb-nci_hci_send_cmd-parameter.patch queue-4.1/nfc-st21nfca-fix-use-of-uninitialized-variables-in-error-path.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html