From: Kees Cook <kees@kernel.org>
To: David Howells <dhowells@redhat.com>
Cc: Kees Cook <kees@kernel.org>,
netfs@lists.linux.dev, linux-kernel@vger.kernel.org,
linux-hardening@vger.kernel.org
Subject: [PATCH v2] cachefiles: Add __nonstring annotations for unterminated strings
Date: Wed, 12 Mar 2025 13:08:26 -0700 [thread overview]
Message-ID: <20250312200825.it.269-kees@kernel.org> (raw)
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@kernel.org>
---
v2: improve commit log
v1: https://lore.kernel.org/lkml/20250310222402.work.925-kees@kernel.org/
Cc: David Howells <dhowells@redhat.com>
Cc: netfs@lists.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
reply other threads:[~2025-03-12 20:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20250312200825.it.269-kees@kernel.org \
--to=kees@kernel.org \
--cc=dhowells@redhat.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netfs@lists.linux.dev \
/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;
as well as URLs for NNTP newsgroup(s).