diff options
| author | Johan Hovold <johan@kernel.org> | 2017-07-09 13:08:58 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2017-11-06 00:53:39 +0100 |
| commit | c45e3e4c5b134b081e8af362109905427967eb19 (patch) | |
| tree | 9083a8a1eaac8c1f6c9b4debc3db3a67deb5291d /net/nfc | |
| parent | 2798b80b385384d51a81832556ee9ad25d175f9b (diff) | |
| download | op-kernel-dev-c45e3e4c5b134b081e8af362109905427967eb19.zip op-kernel-dev-c45e3e4c5b134b081e8af362109905427967eb19.tar.gz | |
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>
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/core.c b/net/nfc/core.c index e5e23c2..2c7c9b3 100644 --- a/net/nfc/core.c +++ b/net/nfc/core.c @@ -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); |
