From: Johan Hovold <johan@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
Dan Carpenter <dan.carpenter@oracle.com>,
Johan Hovold <johan@kernel.org>
Subject: [PATCH 2/2] gnss: fix potential error pointer dereference
Date: Mon, 16 Jul 2018 12:42:03 +0200 [thread overview]
Message-ID: <20180716104203.28440-3-johan@kernel.org> (raw)
In-Reply-To: <20180716104203.28440-1-johan@kernel.org>
From: Dan Carpenter <dan.carpenter@oracle.com>
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>
---
drivers/gnss/core.c | 4 ++--
1 file 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);
--
2.18.0
next prev parent reply other threads:[~2018-07-16 10:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-16 10:42 [PATCH 0/2] gnss: fixes for char-misc-next Johan Hovold
2018-07-16 10:42 ` [PATCH 1/2] gnss: ubx: make struct ubx_gserial_ops static Johan Hovold
2018-07-16 10:42 ` Johan Hovold [this message]
2018-07-16 10:48 ` [PATCH 0/2] gnss: fixes for char-misc-next Greg Kroah-Hartman
2018-07-16 12:16 ` Johan Hovold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180716104203.28440-3-johan@kernel.org \
--to=johan@kernel.org \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).