From: Mostafa Saleh <smostafa@google.com>
To: catalin.marinas@arm.com, will@kernel.org,
linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev,
linux-arm-kernel@lists.infradead.org
Cc: maz@kernel.org, oliver.upton@linux.dev,
kristina.martsenko@arm.com, broonie@kernel.org,
quic_pkondeti@quicinc.com, smostafa@google.com,
justinstitt@google.com
Subject: [PATCH] Revert "arm64/sysreg: refactor deprecated strncpy"
Date: Thu, 31 Aug 2023 16:22:27 +0000 [thread overview]
Message-ID: <20230831162227.2307863-1-smostafa@google.com> (raw)
This reverts commit d232606773a0b09ec7f1ffc25f63abe801d011fd.
Using strscpy is not correct in this context and the commit
assumption is not right "strncpy is deprecated for use on
NUL-terminated destination strings".
strncpy is used here to copy parts of the string(cmdline) separated
by spaces into the buffer and not a NULL terminated string.
This breaks the arm options "kvm-arm.mode=protected, arm64.nobti ..."
Signed-off-by: Mostafa Saleh <smostafa@google.com>
---
arch/arm64/kernel/idreg-override.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c
index aee12c75b738..2fe2491b692c 100644
--- a/arch/arm64/kernel/idreg-override.c
+++ b/arch/arm64/kernel/idreg-override.c
@@ -262,9 +262,9 @@ static __init void __parse_cmdline(const char *cmdline, bool parse_aliases)
if (!len)
return;
- len = strscpy(buf, cmdline, ARRAY_SIZE(buf));
- if (len == -E2BIG)
- len = ARRAY_SIZE(buf) - 1;
+ len = min(len, ARRAY_SIZE(buf) - 1);
+ strncpy(buf, cmdline, len);
+ buf[len] = 0;
if (strcmp(buf, "--") == 0)
return;
--
2.42.0.rc2.253.gd59a3bf2b4-goog
next reply other threads:[~2023-08-31 16:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-31 16:22 Mostafa Saleh [this message]
2023-09-01 11:24 ` Marc Zyngier
2023-09-01 11:57 ` Mostafa Saleh
2023-09-01 13:04 ` Marc Zyngier
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=20230831162227.2307863-1-smostafa@google.com \
--to=smostafa@google.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=justinstitt@google.com \
--cc=kristina.martsenko@arm.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=quic_pkondeti@quicinc.com \
--cc=will@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
all inboxes | Powered by JetHome®