samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tracing: Mark binary printing functions with __printf() attribute

Browse Source 
[ Upstream commit 196a062641fe68d9bfe0ad36b6cd7628c99ad22c ]

Binary printing functions are using printf() type of format, and compiler
is not happy about them as is:

kernel/trace/trace.c:3292:9: error: function ‘trace_vbprintk’ might be a candidate for ‘gnu_printf’ format attribute [-Werror=suggest-attribute=format]
kernel/trace/trace_seq.c:182:9: error: function ‘trace_seq_bprintf’ might be a candidate for ‘gnu_printf’ format attribute [-Werror=suggest-attribute=format]

Fix the compilation errors by adding __printf() attribute.

While at it, move existing __printf() attributes from the implementations
to the declarations. IT also fixes incorrect attribute parameters that are
used for trace_array_printk().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Kees Cook <kees@kernel.org>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20250321144822.324050-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Andy Shevchenko
2025-03-21 16:40:49 +02:00
committed by Greg Kroah-Hartman
parent 50702e7b47
commit c1ab9f008e
4 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/trace.h
View File

@@ -72,8 +72,8 @@ static inline int unregister_ftrace_export(struct trace_export *export)
static inline void trace_printk_init_buffers(void) static inline void trace_printk_init_buffers(void)
{ {
} }
static inline int trace_array_printk(struct trace_array *tr, unsigned long ip, static inline __printf(3, 4)
const char *fmt, ...) int trace_array_printk(struct trace_array *tr, unsigned long ip, const char *fmt, ...)
{ {
return 0; return 0;
} }

8
include/linux/trace_seq.h
View File

@@ -79,8 +79,8 @@ extern __printf(2, 3)
void trace_seq_printf(struct trace_seq *s, const char *fmt, ...); void trace_seq_printf(struct trace_seq *s, const char *fmt, ...);
extern __printf(2, 0) extern __printf(2, 0)
void trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args); void trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args);
extern void extern __printf(2, 0)
trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary); void trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary);
extern int trace_print_seq(struct seq_file *m, struct trace_seq *s); extern int trace_print_seq(struct seq_file *m, struct trace_seq *s);
extern int trace_seq_to_user(struct trace_seq *s, char __user *ubuf, extern int trace_seq_to_user(struct trace_seq *s, char __user *ubuf,
int cnt); int cnt);
@@ -104,8 +104,8 @@ static inline __printf(2, 3)
void trace_seq_printf(struct trace_seq *s, const char *fmt, ...) void trace_seq_printf(struct trace_seq *s, const char *fmt, ...)
{ {
} }
static inline void static inline __printf(2, 0)
trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary) void trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary)
{ {
} }

11
kernel/trace/trace.c
View File

@@ -3487,10 +3487,9 @@ out_nobuffer:
} }
EXPORT_SYMBOL_GPL(trace_vbprintk); EXPORT_SYMBOL_GPL(trace_vbprintk);
__printf(3, 0) static __printf(3, 0)
static int int __trace_array_vprintk(struct trace_buffer *buffer,
__trace_array_vprintk(struct trace_buffer *buffer, unsigned long ip, const char *fmt, va_list args)
unsigned long ip, const char *fmt, va_list args)
{ {
struct trace_event_call *call = &event_print; struct trace_event_call *call = &event_print;
struct ring_buffer_event *event; struct ring_buffer_event *event;
@@ -3543,7 +3542,6 @@ out_nobuffer:
return len; return len;
} }
__printf(3, 0)
int trace_array_vprintk(struct trace_array *tr, int trace_array_vprintk(struct trace_array *tr,
unsigned long ip, const char *fmt, va_list args) unsigned long ip, const char *fmt, va_list args)
{ {
@@ -3573,7 +3571,6 @@ int trace_array_vprintk(struct trace_array *tr,
* Note, trace_array_init_printk() must be called on @tr before this * Note, trace_array_init_printk() must be called on @tr before this
* can be used. * can be used.
*/ */
__printf(3, 0)
int trace_array_printk(struct trace_array *tr, int trace_array_printk(struct trace_array *tr,
unsigned long ip, const char *fmt, ...) unsigned long ip, const char *fmt, ...)
{ {
@@ -3618,7 +3615,6 @@ int trace_array_init_printk(struct trace_array *tr)
} }
EXPORT_SYMBOL_GPL(trace_array_init_printk); EXPORT_SYMBOL_GPL(trace_array_init_printk);
__printf(3, 4)
int trace_array_printk_buf(struct trace_buffer *buffer, int trace_array_printk_buf(struct trace_buffer *buffer,
unsigned long ip, const char *fmt, ...) unsigned long ip, const char *fmt, ...)
{ {
@@ -3634,7 +3630,6 @@ int trace_array_printk_buf(struct trace_buffer *buffer,
return ret; return ret;
} }
__printf(2, 0)
int trace_vprintk(unsigned long ip, const char *fmt, va_list args) int trace_vprintk(unsigned long ip, const char *fmt, va_list args)
{ {
return trace_array_vprintk(&global_trace, ip, fmt, args); return trace_array_vprintk(&global_trace, ip, fmt, args);

16
kernel/trace/trace.h
View File

@@ -800,13 +800,15 @@ static inline void __init disable_tracing_selftest(const char *reason)
extern void *head_page(struct trace_array_cpu *data); extern void *head_page(struct trace_array_cpu *data);
extern unsigned long long ns2usecs(u64 nsec); extern unsigned long long ns2usecs(u64 nsec);
extern int
trace_vbprintk(unsigned long ip, const char *fmt, va_list args); __printf(2, 0)
extern int int trace_vbprintk(unsigned long ip, const char *fmt, va_list args);
trace_vprintk(unsigned long ip, const char *fmt, va_list args); __printf(2, 0)
extern int int trace_vprintk(unsigned long ip, const char *fmt, va_list args);
trace_array_vprintk(struct trace_array *tr, __printf(3, 0)
unsigned long ip, const char *fmt, va_list args); int trace_array_vprintk(struct trace_array *tr,
unsigned long ip, const char *fmt, va_list args);
__printf(3, 4)
int trace_array_printk_buf(struct trace_buffer *buffer, int trace_array_printk_buf(struct trace_buffer *buffer,
unsigned long ip, const char *fmt, ...); unsigned long ip, const char *fmt, ...);
void trace_printk_seq(struct trace_seq *s); void trace_printk_seq(struct trace_seq *s);