linux.git/net/nfc, branch v5.15

NFC: digital: fix possible memory leak in digital_in_send_sdd_req()

2021-10-14T00:44:29+00:00

'skb' is allocated in digital_in_send_sdd_req(), but not free when
digital_in_send_cmd() failed, which will cause memory leak. Fix it
by freeing 'skb' if digital_in_send_cmd() return failed.

Fixes: 2c66daecc409 ("NFC Digital: Add NFC-A technology support")
Signed-off-by: Ziyang Xuan 
Reviewed-by: Krzysztof Kozlowski 
Signed-off-by: Jakub Kicinski

NFC: digital: fix possible memory leak in digital_tg_listen_mdaa()

2021-10-14T00:44:29+00:00

'params' is allocated in digital_tg_listen_mdaa(), but not free when
digital_send_cmd() failed, which will cause memory leak. Fix it by
freeing 'params' if digital_send_cmd() return failed.

Fixes: 1c7a4c24fbfd ("NFC Digital: Add target NFC-DEP support")
Signed-off-by: Ziyang Xuan 
Reviewed-by: Krzysztof Kozlowski 
Signed-off-by: Jakub Kicinski

nfc: fix error handling of nfc_proto_register()

2021-10-14T00:32:38+00:00

When nfc proto id is using, nfc_proto_register() return -EBUSY error
code, but forgot to unregister proto. Fix it by adding proto_unregister()
in the error handling case.

Fixes: c7fe3b52c128 ("NFC: add NFC socket family")
Signed-off-by: Ziyang Xuan 
Reviewed-by: Krzysztof Kozlowski 
Link: https://lore.kernel.org/r/20211013034932.2833737-1-william.xuanziyang@huawei.com
Signed-off-by: Jakub Kicinski

nfc: nci: fix the UAF of rf_conn_info object

2021-10-08T16:24:32+00:00

The nci_core_conn_close_rsp_packet() function will release the conn_info
with given conn_id. However, it needs to set the rf_conn_info to NULL to
prevent other routines like nci_rf_intf_activated_ntf_packet() to trigger
the UAF.

Reviewed-by: Krzysztof Kozlowski 
Signed-off-by: Lin Ma 
Signed-off-by: Krzysztof Kozlowski 
Signed-off-by: David S. Miller

net: in_irq() cleanup

2021-08-13T21:09:19+00:00

Replace the obsolete and ambiguos macro in_irq() with new
macro in_hardirq().

Signed-off-by: Changbin Du 
Link: https://lore.kernel.org/r/20210813145749.86512-1-changbin.du@gmail.com
Signed-off-by: Jakub Kicinski

nfc: hci: pass callback data param as pointer in nci_request()

2021-08-02T14:11:37+00:00

The nci_request() receives a callback function and unsigned long data
argument "opt" which is passed to the callback.  Almost all of the
nci_request() callers pass pointer to a stack variable as data argument.
Only few pass scalar value (e.g. u8).

All such callbacks do not modify passed data argument and in previous
commit they were made as const.  However passing pointers via unsigned
long removes the const annotation.  The callback could simply cast
unsigned long to a pointer to writeable memory.

Use "const void *" as type of this "opt" argument to solve this and
prevent modifying the pointed contents.  This is also consistent with
generic pattern of passing data arguments - via "void *".  In few places
which pass scalar values, use casts via "unsigned long" to suppress any
warnings.

Signed-off-by: Krzysztof Kozlowski 
Signed-off-by: David S. Miller

nfc: hci: cleanup unneeded spaces

2021-07-30T15:22:53+00:00

No need for multiple spaces in variable declaration (the code does not
use them in other places).  No functional change.

Signed-off-by: Krzysztof Kozlowski 
Signed-off-by: Jakub Kicinski

nfc: nci: constify several pointers to u8, sk_buff and other structs

2021-07-30T15:22:52+00:00

Several functions receive pointers to u8, sk_buff or other structs but
do not modify the contents so make them const.  This allows doing the
same for local variables and in total makes the code a little bit safer.

This makes const also data passed as "unsigned long opt" argument to
nci_request() function.  Usual flow for such functions is:
1. Receive "u8 *" and store it (the pointer) in a structure
   allocated on stack (e.g. struct nci_set_config_param),
2. Call nci_request() or __nci_request() passing a callback function an
   the pointer to the structure via an "unsigned long opt",
3. nci_request() calls the callback which dereferences "unsigned long
   opt" in a read-only way.

This converts all above paths to use proper pointer to const data, so
entire flow is safer.

Signed-off-by: Krzysztof Kozlowski 
Signed-off-by: Jakub Kicinski

nfc: constify local pointer variables

2021-07-30T15:22:52+00:00

Few pointers to struct nfc_target and struct nfc_se can be made const.

Signed-off-by: Krzysztof Kozlowski 
Signed-off-by: Jakub Kicinski

nfc: constify several pointers to u8, char and sk_buff

2021-07-30T15:22:52+00:00

Several functions receive pointers to u8, char or sk_buff but do not
modify the contents so make them const.  This allows doing the same for
local variables and in total makes the code a little bit safer.

Signed-off-by: Krzysztof Kozlowski 
Signed-off-by: Jakub Kicinski