Commit 8db14860 authored by Nicolas Iooss's avatar Nicolas Iooss Committed by Linus Torvalds
Browse files

include, lib: add __printf attributes to several function prototypes 



Using __printf attributes helps to detect several format string issues
at compile time (even though -Wformat-security is currently disabled in
Makefile).  For example it can detect when formatting a pointer as a
number, like the issue fixed in commit a3fa71c4 ("wl18xx: show
rx_frames_per_rates as an array as it really is"), or when the arguments
do not match the format string, c.f.  for example commit 5ce1aca8
("reiserfs: fix __RASSERT format string").

To prevent similar bugs in the future, add a __printf attribute to every
function prototype which needs one in include/linux/ and lib/.  These
functions were mostly found by using gcc's -Wsuggest-attribute=format
flag.

Signed-off-by: default avatarNicolas Iooss <nicolas.iooss_linux@m4x.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7f9be775

include/linux/clkdev.h

+4 −3
Original line number Diff line number Diff line
@@ -33,18 +33,19 @@ struct clk_lookup { 
	}



struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id,

	const char *dev_fmt, ...);

	const char *dev_fmt, ...) __printf(3, 4);



void clkdev_add(struct clk_lookup *cl);

void clkdev_drop(struct clk_lookup *cl);



struct clk_lookup *clkdev_create(struct clk *clk, const char *con_id,

	const char *dev_fmt, ...);

	const char *dev_fmt, ...) __printf(3, 4);



void clkdev_add_table(struct clk_lookup *, size_t);

int clk_add_alias(const char *, const char *, const char *, struct device *);



int clk_register_clkdev(struct clk *, const char *, const char *, ...);

int clk_register_clkdev(struct clk *, const char *, const char *, ...)

	__printf(3, 4);

int clk_register_clkdevs(struct clk *, struct clk_lookup *, size_t);



#ifdef CONFIG_COMMON_CLK

include/linux/compat.h

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ asmlinkage long compat_sys_settimeofday(struct compat_timeval __user *tv, 


asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp);



extern int compat_printk(const char *fmt, ...);

extern __printf(1, 2) int compat_printk(const char *fmt, ...);

extern void sigset_from_compat(sigset_t *set, const compat_sigset_t *compat);

extern void sigset_to_compat(compat_sigset_t *compat, const sigset_t *set);

include/linux/configfs.h

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ struct config_item { 
	struct dentry		*ci_dentry;

};



extern int config_item_set_name(struct config_item *, const char *, ...);

extern __printf(2, 3)

int config_item_set_name(struct config_item *, const char *, ...);



static inline char *config_item_name(struct config_item * item)

{

include/linux/cpu.h

+4 −3
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ extern void cpu_remove_dev_attr(struct device_attribute *attr); 
extern int cpu_add_dev_attr_group(struct attribute_group *attrs);

extern void cpu_remove_dev_attr_group(struct attribute_group *attrs);



extern struct device *cpu_device_create(struct device *parent, void *drvdata,

extern __printf(4, 5)

struct device *cpu_device_create(struct device *parent, void *drvdata,

				 const struct attribute_group **groups,

				 const char *fmt, ...);

#ifdef CONFIG_HOTPLUG_CPU

include/linux/dcache.h

+2 −1
Original line number Diff line number Diff line
@@ -327,7 +327,8 @@ static inline unsigned d_count(const struct dentry *dentry) 
/*

 * helper function for dentry_operations.d_dname() members

 */

extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);

extern __printf(4, 5)

char *dynamic_dname(struct dentry *, char *, int, const char *, ...);

extern char *simple_dname(struct dentry *, char *, int);



extern char *__d_path(const struct path *, const struct path *, char *, int);

CRA Git | Maintained and supported by SUSTech CRA and CCSE