From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41416 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760098AbbIWEPj (ORCPT ); Wed, 23 Sep 2015 00:15:39 -0400 Subject: Patch "nfc: st-nci: Free data with irrelevant NDLC PCB_SYNC value" has been added to the 4.2-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:15:00 -0700 Message-ID: <144298170075225@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: st-nci: Free data with irrelevant NDLC PCB_SYNC value to the 4.2-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-st-nci-free-data-with-irrelevant-ndlc-pcb_sync-value.patch and it can be found in the queue-4.2 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 8b706884eac958ec16518315053f77e052627084 Mon Sep 17 00:00:00 2001 From: Christophe Ricard Date: Fri, 14 Aug 2015 22:33:36 +0200 Subject: nfc: st-nci: Free data with irrelevant NDLC PCB_SYNC value From: Christophe Ricard commit 8b706884eac958ec16518315053f77e052627084 upstream. PCB_SYNC different than PCB_TYPE_SUPERVISOR or PCB_TYPE_DATAFRAME should be discarded. Irrelevant data may be forwarded up to the ndlc state machine by phys like spi to prevent missing potential data during "write" transactions. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman --- drivers/nfc/st-nci/ndlc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/nfc/st-nci/ndlc.c +++ b/drivers/nfc/st-nci/ndlc.c @@ -198,8 +198,10 @@ static void llt_ndlc_rcv_queue(struct ll kfree_skb(skb); break; } - } else { + } else if ((pcb & PCB_TYPE_MASK) == PCB_TYPE_DATAFRAME) { nci_recv_frame(ndlc->ndev, skb); + } else { + kfree_skb(skb); } } } Patches currently in stable-queue which might be from christophe.ricard@gmail.com are queue-4.2/nfc-st-nci-fix-typo-when-changing-from-st21nfcb-to-st-nci.patch queue-4.2/nfc-st-nci-remove-duplicate-file-platform_data-st_nci.h.patch queue-4.2/nfc-st-nci-fix-non-accurate-comment-for-st_nci_i2c_read.patch queue-4.2/nfc-st-nci-free-data-with-irrelevant-ndlc-pcb_sync-value.patch queue-4.2/nfc-st-nci-fix-use-of-uninitialized-variables-in-error-path.patch queue-4.2/nfc-netlink-warning-fix.patch queue-4.2/nfc-st-nci-remove-data-from-ack_pending_q-when-receiving-a-sync_ack.patch queue-4.2/nfc-netlink-add-check-on-nfc_attr_vendor_data.patch queue-4.2/nfc-nci-hci-add-check-on-skb-nci_hci_send_cmd-parameter.patch queue-4.2/nfc-st21nfca-fix-use-of-uninitialized-variables-in-error-path.patch