From: Colin King <colin.king@canonical.com>
To: Benson Leung <bleung@chromium.org>,
Enric Balletbo i Serra <enric.balletbo@collabora.com>,
Nick Crews <ncrews@chromium.org>
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH][next] platform/chrome: wilco_ec: fix null pointer dereference on failed kzalloc
Date: Tue, 18 Jun 2019 16:39:24 +0100 [thread overview]
Message-ID: <20190618153924.19491-1-colin.king@canonical.com> (raw)
From: Colin Ian King <colin.king@canonical.com>
If the kzalloc of the entries queue q fails a null pointer dereference
occurs when accessing q->capacity and q->lock. Add a kzalloc failure
check and handle the null return case in the calling function
event_device_add.
Addresses-Coverity: ("Dereference null return")
Fixes: 75589e37d1dc ("platform/chrome: wilco_ec: Add circular buffer as event queue")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/platform/chrome/wilco_ec/event.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/chrome/wilco_ec/event.c b/drivers/platform/chrome/wilco_ec/event.c
index c975b76e6255..e251a989b152 100644
--- a/drivers/platform/chrome/wilco_ec/event.c
+++ b/drivers/platform/chrome/wilco_ec/event.c
@@ -112,8 +112,11 @@ module_param(queue_size, int, 0644);
static struct ec_event_queue *event_queue_new(int capacity)
{
size_t entries_size = sizeof(struct ec_event *) * capacity;
- struct ec_event_queue *q = kzalloc(sizeof(*q) + entries_size,
- GFP_KERNEL);
+ struct ec_event_queue *q;
+
+ q = kzalloc(sizeof(*q) + entries_size, GFP_KERNEL);
+ if (!q)
+ return NULL;
q->capacity = capacity;
spin_lock_init(&q->lock);
@@ -474,6 +477,11 @@ static int event_device_add(struct acpi_device *adev)
/* Initialize the device data. */
adev->driver_data = dev_data;
dev_data->events = event_queue_new(queue_size);
+ if (!dev_data->events) {
+ kfree(dev_data);
+ error = -ENOMEM;
+ goto free_minor;
+ }
init_waitqueue_head(&dev_data->wq);
dev_data->exist = true;
atomic_set(&dev_data->available, 1);
--
2.20.1
next reply other threads:[~2019-06-18 15:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-18 15:39 Colin King [this message]
2019-06-18 17:15 ` [PATCH][next] platform/chrome: wilco_ec: fix null pointer dereference on failed kzalloc Nick Crews
2019-06-18 19:49 ` Benson Leung
2019-06-18 19:50 ` Benson Leung
2019-06-19 5:30 ` Dan Carpenter
2019-06-19 15:44 ` Nick Crews
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=20190618153924.19491-1-colin.king@canonical.com \
--to=colin.king@canonical.com \
--cc=bleung@chromium.org \
--cc=enric.balletbo@collabora.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ncrews@chromium.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