Commit 12d7b504 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

NFC: fix device-allocation error return

commit c45e3e4c 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: 20777bc5 ("NFC: fix broken device allocation")
Reported-by: 's avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: 's avatarJohan Hovold <johan@kernel.org>
Signed-off-by: 's avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: 's avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a027c5e6
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment