From: Yuanjun Gong <ruc_gongyuanjun@163.com>
To: Yuanjun Gong <ruc_gongyuanjun@163.com>,
Benson Leung <bleung@chromium.org>,
chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org
Subject: [PATCH 1/1] platform/chrome: check *dest of memcpy
Date: Tue, 17 May 2022 17:55:21 +0800 [thread overview]
Message-ID: <20220517095521.6897-1-ruc_gongyuanjun@163.com> (raw)
From: Gong Yuanjun <ruc_gongyuanjun@163.com>
In regulator/cros-ec-regulator.c, cros_ec_cmd is sometimes called
with *indata set to NULL.
static int cros_ec_regulator_enable(struct regulator_dev *dev){
...
cros_ec_cmd(data->ec_dev, 0, EC_CMD_REGULATOR_ENABLE, &cmd,
sizeof(cmd), NULL, 0)
...}
Don't do memcpy if indata is NULL.
Signed-off-by: Gong Yuanjun <ruc_gongyuanjun@163.com>
---
drivers/platform/chrome/cros_ec_proto.c | 2 +-
drivers/regulator/cros-ec-regulator.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c
index c4caf2e2de82..da175c57cff7 100644
--- a/drivers/platform/chrome/cros_ec_proto.c
+++ b/drivers/platform/chrome/cros_ec_proto.c
@@ -938,7 +938,7 @@ int cros_ec_command(struct cros_ec_device *ec_dev,
if (ret < 0)
goto error;
- if (insize)
+ if (indata && insize)
memcpy(indata, msg->data, insize);
error:
kfree(msg);
diff --git a/drivers/regulator/cros-ec-regulator.c b/drivers/regulator/cros-ec-regulator.c
index c4754f3cf233..1c7ff085e492 100644
--- a/drivers/regulator/cros-ec-regulator.c
+++ b/drivers/regulator/cros-ec-regulator.c
@@ -44,7 +44,7 @@ static int cros_ec_cmd(struct cros_ec_device *ec, u32 version, u32 command,
if (ret < 0)
goto cleanup;
- if (insize)
+ if (indata && insize)
memcpy(indata, msg->data, insize);
cleanup:
--
2.17.1
next reply other threads:[~2022-05-17 9:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-17 9:55 Yuanjun Gong [this message]
2022-05-17 10:23 ` [PATCH 1/1] platform/chrome: check *dest of memcpy Greg KH
2022-05-18 3:55 ` Tzung-Bi Shih
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=20220517095521.6897-1-ruc_gongyuanjun@163.com \
--to=ruc_gongyuanjun@163.com \
--cc=bleung@chromium.org \
--cc=chrome-platform@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@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).