]> git.baikalelectronics.ru Git - 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)
commit3108f057ba929694c38cf1ea6f79a7e6e0ec2710
tree9083a8a1eaac8c1f6c9b4debc3db3a67deb5291d
parentb0d05e868bf9c1c063f9afc425b8b8cb62a9c26c
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: efa47c050fa8 ("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