linux-stable.git/net/nfc, branch linux-4.3.y

NFC: nci: extract pipe value using NCI_HCP_MSG_GET_PIPE

2015-12-09T19:34:23+00:00

commit e65917b6d54f8b47d8293ea96adfa604fd46cf0d upstream.

When receiving data in nci_hci_msg_rx_work, extract pipe
value using NCI_HCP_MSG_GET_PIPE macro.

Signed-off-by: Christophe Ricard 
Signed-off-by: Samuel Ortiz 
Signed-off-by: Greg Kroah-Hartman

NFC: nci: Fix improper management of HCI return code

2015-12-09T19:34:23+00:00

commit d8cd37ed2fc871c66b4c79c59f651dc2cdf7091c upstream.

When sending HCI data over NCI, HCI return code is part
of the NCI data. In order to get correctly the HCI return
code, we assume the NCI communication is successful and
extract the return code for the nci_hci functions return code.

This is done because nci_to_errno does not match hci return
code value.

Signed-off-by: Christophe Ricard 
Signed-off-by: Samuel Ortiz 
Signed-off-by: Greg Kroah-Hartman

NFC: nci: Fix incorrect data chaining when sending data

2015-12-09T19:34:23+00:00

commit 500c4ef02277eaadbfe20537f963b6221f6ac007 upstream.

When sending HCI data over NCI, cmd information should be
present only on the first packet.
Each packet shall be specifically allocated and sent to the
NCI layer.

Signed-off-by: Christophe Ricard 
Signed-off-by: Samuel Ortiz 
Signed-off-by: Greg Kroah-Hartman

nfc: netlink: Add capability to reply to vendor_cmd with data

2015-08-20T20:00:11+00:00

A proprietary vendor command may send back useful data to the user
application.

For example, the field level applied on the NFC router antenna.

Still based on net/wireless/nl80211.c implementation,
add nfc_vendor_cmd_alloc_reply_skb and nfc_vendor_cmd_reply in
order to send back over netlink data generated by a proprietary
command.

Signed-off-by: Christophe Ricard 
Signed-off-by: Samuel Ortiz

nfc: nci: hci: Add check on skb nci_hci_send_cmd parameter

2015-08-20T19:56:36+00:00

skb can be NULL and may lead to a NULL pointer error.

Add a check condition before setting HCI rx buffer.

Cc: stable@vger.kernel.org
Signed-off-by: Christophe Ricard 
Signed-off-by: Samuel Ortiz

NFC: nci: export nci_core_reset and nci_core_init

2015-08-20T19:23:11+00:00

Some drivers needs to have ability to reinit NCI core, for example
after updating firmware in setup() of post_setup() callback. This
patch makes nci_core_reset() and nci_core_init() functions public,
to make it possible.

Signed-off-by: Robert Baldyga 
Signed-off-by: Samuel Ortiz

NFC: nci: Add post_setup handler

2015-08-20T19:22:34+00:00

Some drivers require non-standard configuration after NCI_CORE_INIT
request, because they need to know ndev->manufact_specific_info or
ndev->manufact_id. This patch adds post_setup handler allowing to do
such custom configuration.

Signed-off-by: Robert Baldyga 
Signed-off-by: Samuel Ortiz

nfc: netlink: Warning fix

2015-08-17T08:45:19+00:00

When NFC_ATTR_VENDOR_DATA is not set, data_len is 0 and data is NULL.

Fixes the following warning:

net/nfc/netlink.c:1536:3: warning: 'data' may be used uninitialized
+in this function [-Wmaybe-uninitialized]
      return cmd->doit(dev, data, data_len);

Cc: stable@vger.kernel.org
Signed-off-by: Christophe Ricard 
Signed-off-by: Samuel Ortiz

nfc: netlink: Add check on NFC_ATTR_VENDOR_DATA

2015-08-16T23:36:17+00:00

NFC_ATTR_VENDOR_DATA is an optional vendor_cmd argument.
The current code was potentially using a non existing argument
leading to potential catastrophic results.

Cc: stable@vger.kernel.org
Signed-off-by: Christophe Ricard 
Signed-off-by: Samuel Ortiz

NFC: nci: fix mistake in uart generic driver

2015-06-15T16:10:37+00:00

It was not possible to register a UART driver due
to a bad condition.

Signed-off-by: Vincent Cuissard 
Signed-off-by: Samuel Ortiz