diff options
| author | Kees Cook <kees@kernel.org> | 2025-04-15 16:24:05 -0700 |
|---|---|---|
| committer | Kees Cook <kees@kernel.org> | 2025-04-28 10:32:43 -0700 |
| commit | ccf1d2b4a1d9ef4287ff51e634c626fd4683b10c (patch) | |
| tree | fe35117e321623e7a8d09690b9907ec3cef77d7d | |
| parent | 8e28276a569addb8a2324439ae473848ee52b056 (diff) | |
input/joystick: magellan: Mark __nonstring look-up table const
GCC 15's new -Wunterminated-string-initialization notices that the
16 character lookup table "nibbles" (which is not used as a C-String)
needs to be marked as "nonstring":
drivers/input/joystick/magellan.c: In function 'magellan_crunch_nibbles':
drivers/input/joystick/magellan.c:51:44: warning: initializer-string for array of 'unsigned char' truncates NUL terminator but destination lacks 'nonstring' attribute (17 chars into 16 available) [-Wunterminated-string-initialization]
51 | static unsigned char nibbles[16] = "0AB3D56GH9:K<MN?";
| ^~~~~~~~~~~~~~~~~~
While the annotation was added in commit 48709ee1fa9a ("gcc-15: add
'__nonstring' markers to byte arrays") also mark the table as const.
Signed-off-by: Kees Cook <kees@kernel.org>
| -rw-r--r-- | drivers/input/joystick/magellan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/magellan.c b/drivers/input/joystick/magellan.c index d73389af4dd5..7622638e5bb8 100644 --- a/drivers/input/joystick/magellan.c +++ b/drivers/input/joystick/magellan.c @@ -48,7 +48,7 @@ struct magellan { static int magellan_crunch_nibbles(unsigned char *data, int count) { - static unsigned char nibbles[16] __nonstring = "0AB3D56GH9:K<MN?"; + static const unsigned char nibbles[16] __nonstring = "0AB3D56GH9:K<MN?"; do { if (data[count] == nibbles[data[count] & 0xf]) |