From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-kernel@vger.kernel.org
Cc: Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH v1 3/6] params: Do not go over the limit when getting the string length
Date: Tue, 12 Sep 2023 18:05:48 +0300 [thread overview]
Message-ID: <20230912150551.401537-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20230912150551.401537-1-andriy.shevchenko@linux.intel.com>
We can use strnlen() even on early stages and it prevents from
going over the string boundaries in case it's already too long.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
kernel/params.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/kernel/params.c b/kernel/params.c
index fb594132ffc7..930a5dc2f004 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -259,7 +259,10 @@ EXPORT_SYMBOL_GPL(param_set_uint_minmax);
int param_set_charp(const char *val, const struct kernel_param *kp)
{
- if (strlen(val) > 1024) {
+ size_t len, maxlen = 1024;
+
+ len = strnlen(val, maxlen + 1);
+ if (len == maxlen + 1) {
pr_err("%s: string parameter too long\n", kp->name);
return -ENOSPC;
}
@@ -269,7 +272,7 @@ int param_set_charp(const char *val, const struct kernel_param *kp)
/* This is a hack. We can't kmalloc in early boot, and we
* don't need to; this mangled commandline is preserved. */
if (slab_is_available()) {
- *(char **)kp->arg = kmalloc_parameter(strlen(val)+1);
+ *(char **)kp->arg = kmalloc_parameter(len + 1);
if (!*(char **)kp->arg)
return -ENOMEM;
strcpy(*(char **)kp->arg, val);
@@ -507,7 +510,7 @@ int param_set_copystring(const char *val, const struct kernel_param *kp)
{
const struct kparam_string *kps = kp->str;
- if (strlen(val)+1 > kps->maxlen) {
+ if (strnlen(val, kps->maxlen) == kps->maxlen) {
pr_err("%s: string doesn't fit in %u chars.\n",
kp->name, kps->maxlen-1);
return -ENOSPC;
--
2.40.0.1.gaa8946217a0b
next prev parent reply other threads:[~2023-09-12 15:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-12 15:05 [PATCH v1 1/6] params: Use sysfs_emit() to instead of scnprintf() Andy Shevchenko
2023-09-12 15:05 ` [PATCH v1 2/6] params: Introduce the param_unknown_fn type Andy Shevchenko
2023-09-12 15:05 ` Andy Shevchenko [this message]
2023-09-12 15:24 ` [PATCH v1 3/6] params: Do not go over the limit when getting the string length Andy Shevchenko
2023-09-12 15:05 ` [PATCH v1 4/6] params: Use size_add() for kmalloc() Andy Shevchenko
2023-09-12 15:05 ` [PATCH v1 5/6] params: Sort headers Andy Shevchenko
2023-09-12 15:05 ` [PATCH v1 6/6] params: Fix multi-line comment style Andy Shevchenko
2023-09-18 16:57 ` [PATCH v1 1/6] params: Use sysfs_emit() to instead of scnprintf() Andy Shevchenko
2023-09-21 0:32 ` Luis Chamberlain
2023-09-21 9:36 ` Andy Shevchenko
2023-09-21 13:34 ` kernel test robot
2023-09-21 15:36 ` Andy Shevchenko
2023-09-21 16:18 ` Andy Shevchenko
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=20230912150551.401537-3-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@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