From: <gregkh@linuxfoundation.org>
To: christophe.ricard@gmail.com, christophe-h.ricard@st.com,
gregkh@linuxfoundation.org, sameo@linux.intel.com
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "nfc: st-nci: Remove data from ack_pending_q when receiving a SYNC_ACK" has been added to the 4.2-stable tree
Date: Tue, 22 Sep 2015 21:15:00 -0700 [thread overview]
Message-ID: <1442981700101246@kroah.com> (raw)
This is a note to let you know that I've just added the patch titled
nfc: st-nci: Remove data from ack_pending_q when receiving a SYNC_ACK
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-remove-data-from-ack_pending_q-when-receiving-a-sync_ack.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 <stable@vger.kernel.org> know about it.
>From 1d816b6eb513498aa28a0ff1e4db7632bded1707 Mon Sep 17 00:00:00 2001
From: Christophe Ricard <christophe.ricard@gmail.com>
Date: Fri, 14 Aug 2015 22:33:35 +0200
Subject: nfc: st-nci: Remove data from ack_pending_q when receiving a SYNC_ACK
From: Christophe Ricard <christophe.ricard@gmail.com>
commit 1d816b6eb513498aa28a0ff1e4db7632bded1707 upstream.
When receiving a NDLC PCB_SYNC_ACK the pending data was never
removed from ack_pending_q and cleared.
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>
---
drivers/nfc/st-nci/ndlc.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/nfc/st-nci/ndlc.c
+++ b/drivers/nfc/st-nci/ndlc.c
@@ -171,6 +171,8 @@ static void llt_ndlc_rcv_queue(struct ll
if ((pcb & PCB_TYPE_MASK) == PCB_TYPE_SUPERVISOR) {
switch (pcb & PCB_SYNC_MASK) {
case PCB_SYNC_ACK:
+ skb = skb_dequeue(&ndlc->ack_pending_q);
+ kfree_skb(skb);
del_timer_sync(&ndlc->t1_timer);
del_timer_sync(&ndlc->t2_timer);
ndlc->t2_active = false;
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
reply other threads:[~2015-09-23 4:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1442981700101246@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=christophe-h.ricard@st.com \
--cc=christophe.ricard@gmail.com \
--cc=sameo@linux.intel.com \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.