NFC: fix device-allocation error return
commitsteinar/wifi_calib_4_9_kernelc45e3e4c5b
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>
parent
a027c5e61d
commit
12d7b5042e
|
@ -1106,7 +1106,7 @@ struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
|
|||
err_free_dev:
|
||||
kfree(dev);
|
||||
|
||||
return ERR_PTR(rc);
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(nfc_allocate_device);
|
||||
|
||||
|
|
Loading…
Reference in New Issue