1
0
Fork 0
remarkable-linux/net/nfc
Johan Hovold 12d7b5042e NFC: fix device-allocation error return
commit c45e3e4c5b upstream.

A recent change fixing NFC device allocation itself introduced an
error-handling bug by returning an error pointer in case device-id
allocation failed. This is clearly broken as the callers still expected
NULL to be returned on errors as detected by Dan's static checker.

Fix this up by returning NULL in the event that we've run out of memory
when allocating a new device id.

Note that the offending commit is marked for stable (3.8) so this fix
needs to be backported along with it.

Fixes: 20777bc57c ("NFC: fix broken device allocation")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-30 08:39:07 +00:00
..
hci NFC: hci: delete unused nfc_llc_get_rx_head_tail_room() 2016-07-04 12:14:05 +02:00
nci NFC: fix broken device allocation 2017-07-27 15:07:56 -07:00
Kconfig NFC Digital: Add NFC-F technology support 2013-09-25 02:02:25 +02:00
Makefile NFC Digital: Add initiator NFC-DEP support 2013-09-25 02:02:27 +02:00
af_nfc.c net: Pass kern from net_proto_family.create to sk_alloc 2015-05-11 10:50:17 -04:00
core.c NFC: fix device-allocation error return 2017-11-30 08:39:07 +00:00
digital.h NFC: digital: Add 'tg_listen_md' and 'tg_get_rf_tech' driver hooks 2014-07-23 01:17:31 +02:00
digital_core.c NFC: digital: Abort last command when dep link goes down 2016-07-06 10:26:52 +02:00
digital_dep.c NFC: digital: Fix RTOX supervisor PDU handling 2016-07-11 02:02:03 +02:00
digital_technology.c NFC: digital: Fix a memory leak in NFC-F listening mode 2016-07-06 10:03:08 +02:00
llcp.h net: Pass kern from net_proto_family.create to sk_alloc 2015-05-11 10:50:17 -04:00
llcp_commands.c NFC: llcp: Fix 2 memory leaks 2016-07-06 10:02:06 +02:00
llcp_core.c NFC: llcp: Use dynamic debug for hex dump 2016-07-04 12:26:27 +02:00
llcp_sock.c NFC: Add sockaddr length checks before accessing sa_family in bind handlers 2017-07-27 15:07:56 -07:00
netlink.c nfc: Ensure presence of required attributes in the activate_target handler 2017-07-27 15:07:56 -07:00
nfc.h nfc: netlink: HCI event connectivity implementation 2015-12-29 19:06:20 +01:00
rawsock.c NFC: netlink: Add mode parameter to deactivate_target functions 2015-10-27 03:55:12 +01:00