summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-12-06 14:55:57 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-12-06 14:55:57 -0500
commit55cb0797fa779e36f62876a8aa44cbf3984e8d59 (patch)
treeea84d334ec666e558d3e4c6dd259a8f239374432 /net/nfc
parent795e9364215dc98b1dea888ebae22383ecbbb92a (diff)
parent289814918ce3af1296ac7d9b05508bde64e97348 (diff)
downloadlinux-stable-55cb0797fa779e36f62876a8aa44cbf3984e8d59.tar.gz
linux-stable-55cb0797fa779e36f62876a8aa44cbf3984e8d59.tar.bz2
linux-stable-55cb0797fa779e36f62876a8aa44cbf3984e8d59.zip
Merge tag 'nfc-fixes-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0
This is an NFC LLCP fix for 3.7 and contains only one patch. It fixes a potential crash when receiving an LLCP HDLC frame acking a frame that is not the last sent one. In that case we may dereference an already freed pointer.
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/llcp/llcp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c
index 2df87056c6df..ec43914c92a9 100644
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@ -985,15 +985,18 @@ static void nfc_llcp_recv_hdlc(struct nfc_llcp_local *local,
/* Remove skbs from the pending queue */
if (llcp_sock->send_ack_n != nr) {
struct sk_buff *s, *tmp;
+ u8 n;
llcp_sock->send_ack_n = nr;
/* Remove and free all skbs until ns == nr */
skb_queue_walk_safe(&llcp_sock->tx_pending_queue, s, tmp) {
+ n = nfc_llcp_ns(s);
+
skb_unlink(s, &llcp_sock->tx_pending_queue);
kfree_skb(s);
- if (nfc_llcp_ns(s) == nr)
+ if (n == nr)
break;
}