kernel.git/net/nfc/nci, branch linux-3.5.y

NFC: Prevent multiple buffer overflows in NCI

2012-06-25T14:38:40Z

Fix multiple remotely-exploitable stack-based buffer overflows due to the NCI code pulling length fields directly from incoming frames and copying too much data into statically-sized arrays. Signed-off-by: Dan Rosenberg Cc: stable@kernel.org Cc: security@kernel.org Cc: Lauro Ramos Venancio Cc: Aloisio Almeida Jr Cc: Samuel Ortiz Cc: David S. Miller Acked-by: Ilan Elias Signed-off-by: Samuel Ortiz

NFC: Quiet nci/ntf.c sparse noise about plain integer as NULL pointer

2012-05-15T21:30:30Z

Pointers should be cleared with NULL, not 0. Quiets a couple sparse warnings of the type: warning: Using plain integer as NULL pointer Signed-off-by: H Hartley Sweeten Cc: Lauro Ramos Venancio Cc: Aloisio Almeida Jr Cc: Samuel Ortiz Cc: "David S. Miller" Signed-off-by: Samuel Ortiz Signed-off-by: John W. Linville

NFC: Include nci_core.h to nci/lib.c

2012-05-15T21:30:29Z

Include the header to pickup the exported symbol prototype. Quites the sparse warning: warning: symbol 'nci_to_errno' was not declared. Should it be static? Signed-off-by: H Hartley Sweeten Cc: Lauro Ramos Venancio Cc: Aloisio Almeida Jr CC: Samuel Ortiz CC: "David S. Miller" Signed-off-by: Samuel Ortiz Signed-off-by: John W. Linville

NFC: Quiet nci/data.c sparse noise about plain integer as NULL pointer

2012-05-15T21:30:29Z

NFC: Cache the core NFC active target pointer instead of its index

2012-05-15T21:27:59Z

The NFC Core now caches the active nfc target pointer, thereby avoiding the need to lookup the target table for each invocation of a driver ops. Consequently, pn533, HCI and NCI now directly receive an nfc_target pointer instead of a target index. Cc: Ilan Elias Signed-off-by: Eric Lapuyade Signed-off-by: Samuel Ortiz Signed-off-by: John W. Linville

NFC: The core part should generate the target index

2012-04-12T19:10:37Z

The target index can be used by userspace to uniquely identify a target and thus should be kept unique, per NFC adapter. Moreover, some protocols do not provide a logical index when discovering new targets, so we have to generate one for them. For NCI or pn533 to fetch their logical index, we added a logical_idx field to the target structure. Signed-off-by: Samuel Ortiz Signed-off-by: John W. Linville

NFC: NCI code identation fixes

2012-03-06T20:16:25Z

Signed-off-by: Samuel Ortiz Signed-off-by: John W. Linville

nfc: NULL vs zero in nci_activate_target()

2012-01-27T19:57:04Z

This is a pointer so it should be NULL instead of zero. Sparse complains about this stuff: net/nfc/nci/core.c:447:37: warning: Using plain integer as NULL pointer Signed-off-by: Dan Carpenter Acked-by: Samuel Ortiz Signed-off-by: John W. Linville

NFC: Add NCI multiple targets support

2012-01-24T19:32:29Z

Add the ability to select between multiple targets in NCI. If only one target is found, it will be auto-activated. If more than one target is found, then DISCOVER_NTF will be generated for each target, and the host should select one by calling DISCOVER_SELECT_CMD. Then, the target will be activated. If the activation fails, GENERIC_ERROR_NTF is generated. Signed-off-by: Ilan Elias Signed-off-by: John W. Linville

NFC: Clearly separate NCI states from flags

2012-01-24T19:32:28Z

Make a clear separation between NCI states and flags. This is required in order to support more NCI states (e.g. for multiple targets support). Signed-off-by: Ilan Elias Signed-off-by: John W. Linville