From: Dan Carpenter <dan.carpenter@oracle.com>
To: Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
Cc: David E Box <david.e.box@intel.com>,
Hans de Goede <hdegoede@redhat.com>,
Mark Gross <mgross@linux.intel.com>,
"David E. Box" <david.e.box@linux.intel.com>,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH] platform/x86: intel_pmc_core: re-write copy in pmc_core_lpm_latch_mode_write()
Date: Wed, 21 Apr 2021 12:34:01 +0300 [thread overview]
Message-ID: <YH/xicL9RXjH2pvD@mwanda> (raw)
There are two bugs in this code:
1) "ret" is unsigned so the error handling is broken.
2) simple_write_to_buffer() is innappropriate. It will succeed even if
we are only able to copy a single byte of data from user space. This
could lead to an information leak if the buf[] array is not fully
initialized.
I've fixed it to use strncpy_from_user() and to return -EINVAL if the
user supplied string is not NUL terminated.
Fixes: 8074a79fad2e ("platform/x86: intel_pmc_core: Add option to set/clear LPM mode")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/platform/x86/intel_pmc_core.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index 3ae00ac85c75..c989796a5d52 100644
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -1360,18 +1360,19 @@ static ssize_t pmc_core_lpm_latch_mode_write(struct file *file,
struct pmc_dev *pmcdev = s->private;
bool clear = false, c10 = false;
unsigned char buf[8];
- size_t ret;
- int idx, m, mode;
+ int idx, m, mode, ret;
+ size_t len;
u32 reg;
- if (count > sizeof(buf) - 1)
+ if (count > sizeof(buf))
return -EINVAL;
- ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, userbuf, count);
+ len = min(count, sizeof(buf));
+ ret = strncpy_from_user(buf, userbuf, len);
if (ret < 0)
return ret;
-
- buf[count] = '\0';
+ if (ret == len)
+ return -EINVAL;
/*
* Allowed strings are:
--
2.30.2
next reply other threads:[~2021-04-21 9:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-21 9:34 Dan Carpenter [this message]
2021-04-21 14:11 ` [PATCH] platform/x86: intel_pmc_core: re-write copy in pmc_core_lpm_latch_mode_write() Hans de Goede
2021-04-21 15:19 ` [PATCH v2] platform/x86: intel_pmc_core: Uninitialized data " Dan Carpenter
2021-04-21 19:32 ` Hans de Goede
2021-04-21 15:32 ` [PATCH] platform/x86: intel_pmc_core: re-write copy " Dan Carpenter
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=YH/xicL9RXjH2pvD@mwanda \
--to=dan.carpenter@oracle.com \
--cc=david.e.box@intel.com \
--cc=david.e.box@linux.intel.com \
--cc=hdegoede@redhat.com \
--cc=irenic.rajneesh@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mgross@linux.intel.com \
--cc=platform-driver-x86@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