From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41278 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750940AbbIWEOv (ORCPT ); Wed, 23 Sep 2015 00:14:51 -0400 Subject: Patch "nfc: nci: hci: Add check on skb nci_hci_send_cmd parameter" has been added to the 4.1-stable tree To: christophe.ricard@gmail.com, christophe-h.ricard@st.com, gregkh@linuxfoundation.org, sameo@linux.intel.com Cc: , From: Date: Tue, 22 Sep 2015 21:14:42 -0700 Message-ID: <1442981682238123@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From 5a9e0ffc0f128ecdf7c770f76c268e4f9f3c9118 Mon Sep 17 00:00:00 2001 From: Christophe Ricard 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 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 Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman --- 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@gmail.com 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