summaryrefslogtreecommitdiffstats
path: root/drivers/gnss
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2018-07-16 12:42:03 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-16 12:48:07 +0200
commitd9995a0fab40af333b08902ad43a387843ca0e17 (patch)
tree98e3a413a9db294b3532ddcb5e59ce71afafac4e /drivers/gnss
parent55570f1a441787f67efe1aef3b5deae431ca7ee9 (diff)
downloadlinux-d9995a0fab40af333b08902ad43a387843ca0e17.tar.gz
linux-d9995a0fab40af333b08902ad43a387843ca0e17.tar.bz2
linux-d9995a0fab40af333b08902ad43a387843ca0e17.zip
gnss: fix potential error pointer dereference
The gnss_allocate_device() function returns a mix of NULL and error pointers on error. It should only return one or the other. Since the callers both check for NULL, I've modified it to return NULL on error. Fixes: 2b6a44035143 ("gnss: add GNSS receiver subsystem") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gnss')
-rw-r--r--drivers/gnss/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gnss/core.c b/drivers/gnss/core.c
index f30ef8338b3a..4291a0dd22aa 100644
--- a/drivers/gnss/core.c
+++ b/drivers/gnss/core.c
@@ -235,7 +235,7 @@ struct gnss_device *gnss_allocate_device(struct device *parent)
id = ida_simple_get(&gnss_minors, 0, GNSS_MINORS, GFP_KERNEL);
if (id < 0) {
kfree(gdev);
- return ERR_PTR(id);
+ return NULL;
}
gdev->id = id;
@@ -270,7 +270,7 @@ struct gnss_device *gnss_allocate_device(struct device *parent)
err_put_device:
put_device(dev);
- return ERR_PTR(-ENOMEM);
+ return NULL;
}
EXPORT_SYMBOL_GPL(gnss_allocate_device);