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>] [day] [month] [year] [list]
Message-Id: <20250312200825.it.269-kees@kernel.org>
Date: Wed, 12 Mar 2025 13:08:26 -0700
From: Kees Cook <kees@...nel.org>
To: David Howells <dhowells@...hat.com>
Cc: Kees Cook <kees@...nel.org>,
	netfs@...ts.linux.dev,
	linux-kernel@...r.kernel.org,
	linux-hardening@...r.kernel.org
Subject: [PATCH v2] cachefiles: Add __nonstring annotations for unterminated strings

When a character array without a terminating NUL character has a static
initializer, GCC 15's -Wunterminated-string-initialization will only
warn if the array lacks the "nonstring" attribute[1]. Mark the array
with __nonstring to correctly identify the char array as "not a C string"
and thereby eliminate the warning:

../fs/cachefiles/key.c:12:9: warning: initializer-string for array of 'char' truncates NUL terminator but destination lacks 'nonstring' attribute (65 chars into 64 available) [-Wunterminated-string-initialization]
   12 |         "0123456789"                    /* 0 - 9 */
      |         ^~~~~~~~~~~~

Since the array is used only for single character look-ups, use
__nonstring:

fs/cachefiles/key.c:123:                name[len++] = cachefiles_charmap[acc & 63];
fs/cachefiles/key.c:125:                name[len++] = cachefiles_charmap[acc & 63];
fs/cachefiles/key.c:127:                name[len++] = cachefiles_charmap[acc & 63];
fs/cachefiles/key.c:129:                name[len++] = cachefiles_charmap[acc & 63];

Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117178 [1]
Signed-off-by: Kees Cook <kees@...nel.org>
---
 v2: improve commit log
 v1: https://lore.kernel.org/lkml/20250310222402.work.925-kees@kernel.org/
Cc: David Howells <dhowells@...hat.com>
Cc: netfs@...ts.linux.dev
---
 fs/cachefiles/key.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/cachefiles/key.c b/fs/cachefiles/key.c
index bf935e25bdbe..b48525680e73 100644
--- a/fs/cachefiles/key.c
+++ b/fs/cachefiles/key.c
@@ -8,7 +8,7 @@
 #include <linux/slab.h>
 #include "internal.h"
 
-static const char cachefiles_charmap[64] =
+static const char cachefiles_charmap[64] __nonstring =
 	"0123456789"			/* 0 - 9 */
 	"abcdefghijklmnopqrstuvwxyz"	/* 10 - 35 */
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"	/* 36 - 61 */
-- 
2.34.1


Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ