Skip to content

Commit

Permalink
NFC: fix device-allocation error return
Browse files Browse the repository at this point in the history
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: 20777bc ("NFC: fix broken device allocation")
Cc: stable <[email protected]>	# 3.8
Reported-by: Dan Carpenter <[email protected]>
Signed-off-by: Johan Hovold <[email protected]>
Signed-off-by: Samuel Ortiz <[email protected]>
  • Loading branch information
jhovold authored and Samuel Ortiz committed Nov 5, 2017
1 parent 2798b80 commit c45e3e4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/nfc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,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);

Expand Down

0 comments on commit c45e3e4

Please sign in to comment.