Skip to contentSkip to conversation

bug: avoid format attribute warning for clang as well

PATCH Applied Arnd Bergmann 3 participants 3 messages Mar 23 – Mar 24 Library code

lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH v2 1/1 bug: avoid format attribute warning for clang as well

From: Arnd Bergmann <[email protected]>

Like gcc, clang-22 now also warns about a function that it incorrectly identifies as a printf-style format:

lib/bug.c:190:22: error: diagnostic behavior may be improved by adding the 'format(printf, 1, 0)' attribute to the declaration of '__warn_printf' [-Werror,-Wmissing-format-attribute]

  179 | static void __warn_printf(const char *fmt, struct pt_regs *regs)
      | __attribute__((format(printf, 1, 0)))
  180 | {
  181 |         if (!fmt)
  182 |                 return;
  183 |
  184 | #ifdef HAVE_ARCH_BUG_FORMAT_ARGS
  185 |         if (regs) {
  186 |                 struct arch_va_list _args;
  187 |                 va_list *args = __warn_args(&_args, regs);
  188 |
  189 |                 if (args) {
  190 |                         vprintk(fmt, *args);
      |                                           ^

Revert the change that added a gcc-specific workaround, and instead add the generic annotation that avoid the warning.

Fixes d36067d6ea00 ("bug: Hush suggest-attribute=format for __warn_printf()")
Suggested-by Andy Shevchenko <[email protected]>
Suggested-by Brendan Jackman <[email protected]>
Link https://lore.kernel.org/all/[email protected]/T/#u open here
Signed-off-by Arnd Bergmann <[email protected]>

---
Replace my earlier patch with Andy's solution

---
 lib/bug.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
lib/bug.c +2 -5
index bbc301097749..224f4cfa4aa3 100644
@@ -173,10 +173,8 @@ struct bug_entry *find_bug(unsigned long bugaddr)
 	return module_find_bug(bugaddr);
 }
 
-__diag_push();
-__diag_ignore(GCC, all, "-Wsuggest-attribute=format",
-	      "Not a valid __printf() conversion candidate.");
-static void __warn_printf(const char *fmt, struct pt_regs *regs)
+static __printf(1, 0)
+void __warn_printf(const char *fmt, struct pt_regs *regs)
 {
 	if (!fmt)
 		return;

@@ -195,7 +193,6 @@ static void __warn_printf(const char *fmt, struct pt_regs *regs)
 
 	printk("%s", fmt);
 }
-__diag_pop();
 
 static enum bug_trap_type __report_bug(struct bug_entry *bug, unsigned long bugaddr, struct pt_regs *regs)
 {
Signature · 1 line
2.39.5
Reviewed-by on v2 1/1
#1 lore raw
Quoted 21 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

Like gcc, clang-22 now also warns about a function that it incorrectly identifies as a printf-style format:

lib/bug.c:190:22: error: diagnostic behavior may be improved by adding the 'format(printf, 1, 0)' attribute to the declaration of '__warn_printf' [-Werror,-Wmissing-format-attribute]

  179 | static void __warn_printf(const char *fmt, struct pt_regs *regs)
      | __attribute__((format(printf, 1, 0)))
  180 | {
  181 |         if (!fmt)
  182 |                 return;
  183 |
  184 | #ifdef HAVE_ARCH_BUG_FORMAT_ARGS
  185 |         if (regs) {
  186 |                 struct arch_va_list _args;
  187 |                 va_list *args = __warn_args(&_args, regs);
  188 |
  189 |                 if (args) {
  190 |                         vprintk(fmt, *args);
      |                                           ^
Quoted 8 lines

Revert the change that added a gcc-specific workaround, and instead add the generic annotation that avoid the warning.

Fixes d36067d6ea00 ("bug: Hush suggest-attribute=format for __warn_printf()")
Suggested-by Andy Shevchenko <[email protected]>
Suggested-by Brendan Jackman <[email protected]>
Link https://lore.kernel.org/all/[email protected]/T/#u open here
Signed-off-by Arnd Bergmann <[email protected]>

Thank you,

Reviewed-by Brendan Jackman <[email protected]>
Reviewed-by on v2 1/1
#2 lore raw
In reply to Arnd Bergmann
Quoted 19 lines · Arnd Bergmann

Like gcc, clang-22 now also warns about a function that it incorrectly identifies as a printf-style format:

lib/bug.c:190:22: error: diagnostic behavior may be improved by adding the 'format(printf, 1, 0)' attribute to the declaration of '__warn_printf' [-Werror,-Wmissing-format-attribute]

  179 | static void __warn_printf(const char *fmt, struct pt_regs *regs)
      | __attribute__((format(printf, 1, 0)))
  180 | {
  181 |         if (!fmt)
  182 |                 return;
  183 |
  184 | #ifdef HAVE_ARCH_BUG_FORMAT_ARGS
  185 |         if (regs) {
  186 |                 struct arch_va_list _args;
  187 |                 va_list *args = __warn_args(&_args, regs);
  188 |
  189 |                 if (args) {
  190 |                         vprintk(fmt, *args);
      |                                           ^
Quoted 2 lines

Revert the change that added a gcc-specific workaround, and instead add the generic annotation that avoid the warning.

Reviewed-by Andy Shevchenko <[email protected]>
Signature · 2 lines
With Best Regards,
Andy Shevchenko