]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
NFC: fix device-allocation error return
authorJohan Hovold <johan@kernel.org>
Sun, 9 Jul 2017 11:08:58 +0000 (13:08 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Sun, 5 Nov 2017 23:53:39 +0000 (00:53 +0100)
commitc45e3e4c5b134b081e8af362109905427967eb19
tree9083a8a1eaac8c1f6c9b4debc3db3a67deb5291d
parent2798b80b385384d51a81832556ee9ad25d175f9b
NFC: fix device-allocation error return

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: 20777bc57c34 ("NFC: fix broken device allocation")
Cc: stable <stable@vger.kernel.org> # 3.8
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>
net/nfc/core.c