Skip to content

Commit 58db1c3

Browse files
keesbrauner
authored andcommitted
netfs: Mark __nonstring lookup tables
GCC 15's new -Wunterminated-string-initialization notices that the character lookup tables "fscache_cache_states" and "fscache_cookie_states" (which are not used as a C-String) need to be marked as "nonstring": fs/netfs/fscache_cache.c:375:67: warning: initializer-string for array of 'char' truncates NUL terminator but destination lacks 'nonstring' attribute (6 chars into 5 available) [-Wunterminated-string-initialization] 375 | static const char fscache_cache_states[NR__FSCACHE_CACHE_STATE] = "-PAEW"; | ^~~~~~~ fs/netfs/fscache_cookie.c:32:69: warning: initializer-string for array of 'char' truncates NUL terminator but destination lacks 'nonstring' attribute (11 chars into 10 available) [-Wunterminated-string-initialization] 32 | static const char fscache_cookie_states[FSCACHE_COOKIE_STATE__NR] = "-LCAIFUWRD"; | ^~~~~~~~~~~~ Annotate the arrays. Signed-off-by: Kees Cook <kees@kernel.org> Link: https://lore.kernel.org/20250416221654.work.028-kees@kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 0a65bc2 commit 58db1c3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

fs/netfs/fscache_cache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ void fscache_withdraw_cache(struct fscache_cache *cache)
372372
EXPORT_SYMBOL(fscache_withdraw_cache);
373373

374374
#ifdef CONFIG_PROC_FS
375-
static const char fscache_cache_states[NR__FSCACHE_CACHE_STATE] = "-PAEW";
375+
static const char fscache_cache_states[NR__FSCACHE_CACHE_STATE] __nonstring = "-PAEW";
376376

377377
/*
378378
* Generate a list of caches in /proc/fs/fscache/caches

fs/netfs/fscache_cookie.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static LIST_HEAD(fscache_cookie_lru);
2929
static DEFINE_SPINLOCK(fscache_cookie_lru_lock);
3030
DEFINE_TIMER(fscache_cookie_lru_timer, fscache_cookie_lru_timed_out);
3131
static DECLARE_WORK(fscache_cookie_lru_work, fscache_cookie_lru_worker);
32-
static const char fscache_cookie_states[FSCACHE_COOKIE_STATE__NR] = "-LCAIFUWRD";
32+
static const char fscache_cookie_states[FSCACHE_COOKIE_STATE__NR] __nonstring = "-LCAIFUWRD";
3333
static unsigned int fscache_lru_cookie_timeout = 10 * HZ;
3434

3535
void fscache_print_cookie(struct fscache_cookie *cookie, char prefix)

0 commit comments

Comments
 (0)