kernel.git/drivers/nfc/st-nci, branch linux-4.9.y

nfc: st-nci: fix memory leaks in EVT_TRANSACTION

2022-12-08T10:15:39Z

[ Upstream commit 440f2ae9c9f06e26f5dcea697a53717fc61a318c ] Error path does not free previously allocated memory. Add devm_kfree() to the failure path. Reported-by: Denis Efremov Reviewed-by: Guenter Roeck Fixes: 5d1ceb7f5e56 ("NFC: st21nfcb: Add HCI transaction event support") Signed-off-by: Martin Faltesek Reviewed-by: Krzysztof Kozlowski Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin

nfc: st-nci: fix incorrect validating logic in EVT_TRANSACTION

2022-12-08T10:15:39Z

[ Upstream commit c60c152230828825c06e62a8f1ce956d4b659266 ] The first validation check for EVT_TRANSACTION has two different checks tied together with logical AND. One is a check for minimum packet length, and the other is for a valid aid_tag. If either condition is true (fails), then an error should be triggered. The fix is to change && to ||. Reported-by: Denis Efremov Reviewed-by: Guenter Roeck Fixes: 5d1ceb7f5e56 ("NFC: st21nfcb: Add HCI transaction event support") Signed-off-by: Martin Faltesek Reviewed-by: Krzysztof Kozlowski Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin

st_nci_hci_connectivity_event_received: null check the allocation

2019-09-06T08:19:32Z

[ Upstream commit 3008e06fdf0973770370f97d5f1fba3701d8281d ] devm_kzalloc may fail and return NULL. So the null check is needed. Signed-off-by: Navid Emamdoost Signed-off-by: David S. Miller Signed-off-by: Sasha Levin

nfc: st-nci: Move loopback usage from HCI to NCI

2016-05-03T23:51:42Z

NCI provides possible way to run loopback testing has done over HCI. For us it offers many advantages: - It simplifies the code: No more need for a vendor_cmds structure - Loopback over HCI may not be supported in future st-nci firmware Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

nfc: nci: Add an additional parameter to identify a connection id

2016-05-03T23:43:21Z

According to NCI specification, destination type and destination specific parameters shall uniquely identify a single destination for the Logical Connection. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

nfc: st-nci: Remove redundant ST_NCI_HCI_HOST_ID_ESE from st-nci.h

2016-05-03T23:39:36Z

ST_NCI_HCI_HOST_ID_ESE is already having an equivalent in se.c (ST_NCI_ESE_HOST_ID). Remove and replace where relevant. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

NFC: st-nci: spi: Drop two useless checks in ACPI probe path

2016-05-03T23:38:13Z

When st_nci_spi_acpi_request_resources() gets called we already know that the entries in ->acpi_match_table have matched ACPI ID of the device. In addition spi_device pointer cannot be NULL in any case (otherwise SPI core would not call ->probe() for the driver in the first place). Drop the two useless checks from the driver. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

NFC: st-nci: i2c: Drop two useless checks in ACPI probe path

2016-05-03T23:37:13Z

When st_nci_i2c_acpi_request_resources() gets called we already know that the entries in ->acpi_match_table have matched ACPI ID of the device. In addition I2C client pointer cannot be NULL in any case (otherwise I2C core would not call ->probe() for the driver in the first place). Drop the two useless checks from the driver. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

nfc: st-nci: A APDU_READER_GATE pipe is unexpected on a UICC

2016-05-03T23:33:08Z

An APDU_READER_GATE pipe is not expected on a UICC. Be more explicit so that an other secure element form factor (SD card) does not prompt this message. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

nfc: st-nci: Simplify white list building

2016-05-03T23:32:25Z

Simplify white list Building Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz