]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 795e936 2898149)
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)
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.

1  2 
net/mac80211/offchannel.c patch | diff1 | diff2 | blob | history
net/nfc/llcp/llcp.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/offchannel.c
Simple merge
diff --cc net/nfc/llcp/llcp.c
Simple merge
XArray, radix tree and IDR