From: Thorsten Blum <thorsten.blum@linux.dev>
To: Masahiro Yamada <masahiroy@kernel.org>,
Thorsten Blum <thorsten.blum@linux.dev>,
Randy Dunlap <rdunlap@infradead.org>,
Nicolas Schier <nicolas.schier@linux.dev>,
Shankari Anand <shankari.ak0208@gmail.com>,
"nir.tzachar@gmail.com" <nir.tzachar@gmail.com>,
Michal Marek <mmarek@suse.cz>
Cc: stable@vger.kernel.org, linux-kbuild@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] kconfig: nconf: NUL-terminate 'line' correctly in fill_window()
Date: Sun, 10 Aug 2025 16:22:37 +0200 [thread overview]
Message-ID: <20250810142239.120294-2-thorsten.blum@linux.dev> (raw)
Use 'min(len, x)' as the index instead of just 'len' to NUL-terminate
the copied 'line' string at the correct position.
Add a newline after the local variable declarations to silence a
checkpatch warning.
Cc: stable@vger.kernel.org
Fixes: 692d97c380c6 ("kconfig: new configuration interface (nconfig)")
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
scripts/kconfig/nconf.gui.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c
index 7206437e784a..ec021ebd2c52 100644
--- a/scripts/kconfig/nconf.gui.c
+++ b/scripts/kconfig/nconf.gui.c
@@ -175,8 +175,9 @@ void fill_window(WINDOW *win, const char *text)
for (i = 0; i < total_lines; i++) {
char tmp[x+10];
const char *line = get_line(text, i);
- int len = get_line_length(line);
- strncpy(tmp, line, min(len, x));
+ int len = min(get_line_length(line), x);
+
+ strncpy(tmp, line, len);
tmp[len] = '\0';
mvwprintw(win, i, 0, "%s", tmp);
}
--
2.50.1
next reply other threads:[~2025-08-10 14:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-10 14:22 Thorsten Blum [this message]
2025-08-11 0:19 ` [PATCH] kconfig: nconf: NUL-terminate 'line' correctly in fill_window() Randy Dunlap
2025-08-11 12:51 ` Franco Martelli
2025-08-11 15:08 ` Thorsten Blum
2025-08-11 16:19 ` Thorsten Blum
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=20250810142239.120294-2-thorsten.blum@linux.dev \
--to=thorsten.blum@linux.dev \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=mmarek@suse.cz \
--cc=nicolas.schier@linux.dev \
--cc=nir.tzachar@gmail.com \
--cc=rdunlap@infradead.org \
--cc=shankari.ak0208@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.