linux-kernel - [PATCH] kconfig: nconf: NUL-terminate 'line' correctly in fill

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250810142239.120294-2-thorsten.blum@linux.dev>
Date: Sun, 10 Aug 2025 16:22:37 +0200
From: Thorsten Blum <thorsten.blum@...ux.dev>
To: Masahiro Yamada <masahiroy@...nel.org>,
	Thorsten Blum <thorsten.blum@...ux.dev>,
	Randy Dunlap <rdunlap@...radead.org>,
	Nicolas Schier <nicolas.schier@...ux.dev>,
	Shankari Anand <shankari.ak0208@...il.com>,
	"nir.tzachar@...il.com" <nir.tzachar@...il.com>,
	Michal Marek <mmarek@...e.cz>
Cc: stable@...r.kernel.org,
	linux-kbuild@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: [PATCH] kconfig: nconf: NUL-terminate 'line' correctly in fill_window()

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@...r.kernel.org
Fixes: 692d97c380c6 ("kconfig: new configuration interface (nconfig)")
Signed-off-by: Thorsten Blum <thorsten.blum@...ux.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