linux-stable.git/net/nfc, branch v3.8 Linux kernel stable tree nfc: remove noisy message from llcp_sock_sendmsg 2012-12-13T17:58:10+00:00 Dave Jones davej@redhat.com 2012-12-12T18:11:34+00:00 026e43def736923fedb9919a0bd22fff7ba03e8b This is easily triggerable when fuzz-testing as an unprivileged user. We could rate-limit it, but given we don't print similar messages for other protocols, I just removed it. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
This is easily triggerable when fuzz-testing as an unprivileged user.
We could rate-limit it, but given we don't print similar messages
for other protocols, I just removed it.

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Merge tag 'nfc-fixes-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0 2012-12-06T19:55:57+00:00 John W. Linville linville@tuxdriver.com 2012-12-06T19:55:57+00:00 55cb0797fa779e36f62876a8aa44cbf3984e8d59 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. 
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.
NFC: Fix incorrect llcp pointer dereference 2012-11-28T17:42:04+00:00 Waldemar Rymarkiewicz waldemar.rymarkiewicz@tieto.com 2012-11-26T07:40:04+00:00 289814918ce3af1296ac7d9b05508bde64e97348 nfc_llcp_ns(s) dereferences the s pointer which is freed a line above. In a result, it can produce a crash or you will read incorrect value. Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 
nfc_llcp_ns(s) dereferences the s pointer which is freed a line
above. In a result, it can produce a crash or you will read
incorrect value.

Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-11-21T17:57:56+00:00 John W. Linville linville@tuxdriver.com 2012-11-21T17:57:56+00:00 b3117494772d8f906625905c6e203af745ee3530 Conflicts: drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c drivers/net/wireless/iwlwifi/pcie/tx.c 
Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
	drivers/net/wireless/iwlwifi/pcie/tx.c
NFC: Fix nfc_llcp_local chained list insertion 2012-11-19T23:09:25+00:00 Thierry Escande thierry.escande@linux.intel.com 2012-10-12T13:25:43+00:00 16a78e9fed5e8baa8480ae3413f4328c4537c599 list_add was called with swapped parameters Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 
list_add was called with swapped parameters

Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
NFC: Queue a copy of the transmitted LLCP skb 2012-11-19T22:57:01+00:00 Samuel Ortiz sameo@linux.intel.com 2012-11-01T22:36:07+00:00 be02b6b624005d47c388f799ce23714136430217 Drivers are allowed to modify the sent skb and thus we need to make a copy of it before passing it to the driver. Without this fix, LLCP Tx skbs were not queued properly as the ptype check was failing due to e.g. the pn533 driver skb_pushing the Tx skb. Reported-by: Thierry Escande <thierry.escande@linux.intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 
Drivers are allowed to modify the sent skb and thus we need to make a copy
of it before passing it to the driver. Without this fix, LLCP Tx skbs were
not queued properly as the ptype check was failing due to e.g. the pn533
driver skb_pushing the Tx skb.

Reported-by: Thierry Escande <thierry.escande@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
NFC: Stop sending LLCP frames when tx queues are getting too deep 2012-11-19T22:57:00+00:00 Samuel Ortiz sameo@linux.intel.com 2012-11-01T22:33:00+00:00 dd2bf43ffcf0d1bba94d20abc6cc44ed294db66b When the tx pending queues and/or the socket tx queue is getting too deep, we have to let userspace know. We won't be queueing any more frames until the congestion is fixed. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 
When the tx pending queues and/or the socket tx queue is getting too deep,
we have to let userspace know. We won't be queueing any more frames until
the congestion is fixed.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
NFC: Copy user space buffer when sending UI frames 2012-11-19T22:57:00+00:00 Samuel Ortiz sameo@linux.intel.com 2012-10-29T13:02:17+00:00 6e950fd214645e71e94bce2429bea58b88e1b5d0 Using the userspace IO vector directly is wrong, we should copy it from user space first. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 
Using the userspace IO vector directly is wrong, we should copy it from
user space first.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
NFC: Export nfc_hci_sak_to_protocol() 2012-11-19T22:56:59+00:00 Eric Lapuyade eric.lapuyade@linux.intel.com 2012-10-23T09:37:43+00:00 9c5121a034b1414d83c553e9961bda823e2e65b4 Some HCI drivers will need it. Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 
Some HCI drivers will need it.

Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
NFC: Export nfc_hci_result_to_errno as it can be needed by HCI drivers 2012-11-19T22:56:59+00:00 Eric Lapuyade eric.lapuyade@linux.intel.com 2012-10-17T14:50:10+00:00 84d4819033972f6bae2b34a8ba07c5c2e836e989 Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 
Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>