Merge tag 'nfc-fixes-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 6 Dec 2012 19:55:57 +0000 (14:55 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 6 Dec 2012 19:55:57 +0000 (14:55 -0500)
commit55cb0797fa779e36f62876a8aa44cbf3984e8d59
treeea84d334ec666e558d3e4c6dd259a8f239374432
parent795e9364215dc98b1dea888ebae22383ecbbb92a
parent289814918ce3af1296ac7d9b05508bde64e97348
Merge tag 'nfc-fixes-3.7-2' of git://git./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.
net/mac80211/offchannel.c
net/nfc/llcp/llcp.c