format updates for handing format attribute
Subsystems (2)
Hi, this is the update set for the format attributes.
I think the only thing I'm still thinking about is whether to just merged patches 3 and 4.
branch:
https://gitlab.com/CodethinkLabs/sparse.git bjdooks/printf-v062
PATCH 1/4 tests: add varargs printf format tests
Add some tests for the new printf format checking code. Note, these do not all pass yet.
--- validation/varargs-format-addrspace1.c | 36 ++++++++ validation/varargs-format-bad.c | 18 ++++ validation/varargs-format-checking.c | 21 +++++ validation/varargs-format-position.c | 32 +++++++ validation/varargs-format-prefix.c | 19 ++++ validation/varargs-format-tests.c | 55 ++++++++++++ validation/varargs-type-formattest.c | 117 +++++++++++++++++++++++++ 7 files changed, 298 insertions(+) create mode 100644 validation/varargs-format-addrspace1.c create mode 100644 validation/varargs-format-bad.c create mode 100644 validation/varargs-format-checking.c create mode 100644 validation/varargs-format-position.c create mode 100644 validation/varargs-format-prefix.c create mode 100644 validation/varargs-format-tests.c create mode 100644 validation/varargs-type-formattest.c
validation/varargs-format-addrspace1.c new file +36 -0
@@ -0,0 +1,36 @@ + +extern int variadic (char *msg, ...) __attribute__((format (printf,1 ,2 ))); +extern int variadic2 (char *msg,int , ...) __attribute__((format (printf,1 ,3 ))); +extern int variadic3 (int ,char *msg, ...) __attribute__((format (printf,2 ,3 ))); + +static void test (void ) { +void __attribute__((noderef,address_space (1 ))) *a; +void *b; + +variadic ("%s\n" , a); +variadic ("%s\n" , b); +variadic ("%s %s\n" , b, a); +variadic2 ("%s %s\n" ,1 , b, a); +variadic3 (1 ,"%s %s\n" , b, a); +variadic3 (1 ,"%s %p\n" , b, a); +} + +/* +* check-name: variadic formatting test with address-space to %s +* check-command: sparse -Wformat $file +* +* check-error-start +varargs-format-addrspace1.c:10:26: warning: incorrect type in argument 2 (different address spaces) +varargs-format-addrspace1.c:10:26: expected char const * +varargs-format-addrspace1.c:10:26: got void [noderef] <asn:1> *a +varargs-format-addrspace1.c:12:32: warning: incorrect type in argument 3 (different address spaces) +varargs-format-addrspace1.c:12:32: expected char const * +varargs-format-addrspace1.c:12:32: got void [noderef] <asn:1> *a +varargs-format-addrspace1.c:13:36: warning: incorrect type in argument 4 (different address spaces) +varargs-format-addrspace1.c:13:36: expected char const * +varargs-format-addrspace1.c:13:36: got void [noderef] <asn:1> *a +varargs-format-addrspace1.c:14:36: warning: incorrect type in argument 4 (different address spaces) +varargs-format-addrspace1.c:14:36: expected char const * +varargs-format-addrspace1.c:14:36: got void [noderef] <asn:1> *a +* check-error-end +*/
validation/varargs-format-bad.c new file +18 -0
@@ -0,0 +1,18 @@ + +extern int variadic (char *msg, ...) __attribute__((format (printf,0 ,0 ))); +extern int variadic2 (char *msg,int , ...) __attribute__((format (printf,2 ,2 ))); +extern int variadic3 (char *msg,int , ...) __attribute__((format (printf,2 ,1 ))); + +static void test (void ) { +} + +/* +* check-name: variadic formatting test with bad formatting parameters +* check-command: sparse -Wformat $file +* +* check-error-start +varargs-format-bad.c:2:73: warning: bad format positions +varargs-format-bad.c:3:80: warning: bad format positions +varargs-format-bad.c:4:80: warning: format cannot be after va_args +* check-error-end +*/
validation/varargs-format-checking.c new file +21 -0
@@ -0,0 +1,21 @@ + +extern void pf (char *msg, ...) __attribute__((format (printf,1 ,2 ))); + +static void test (void ) { +pf ("%u %lu %llu\n" ,1U ,1UL ,1ULL ); +pf ("%d %ld %lld\n" ,1 ,1L ,1LL ); +pf ("%x %lx %llx\n" ,1U ,1UL ,1ULL ); +pf ("%d %ld %lld\n" ,1 ,1L ,1L ); +} + +/* +* check-name: variadic formatting test type checking +* check-command: sparse -Wformat $file +* check-known-to-fail +* +* check-error-start +varargs-format-checking.c:8:36: warning: incorrect type in argument 4 (different types) +varargs-format-checking.c:8:36: expected long long +varargs-format-checking.c:8:36: got long +* check-error-end +*/
validation/varargs-format-position.c new file +32 -0
@@ -0,0 +1,32 @@ + +extern void pf (char *msg, ...) __attribute__((format (printf,1 ,2 ))); + +static void test (void ) { +pf ("%2$d %u\n" ,1U ,1L ); +pf ("%3$d %2$u\n" ,1U ,1 ); +pf ("%1$d %2$d\n" ,1L ,1 ); +} + +/* +* check-name: variadic formatting test position checking +* check-command: sparse -Wformat $file +* check-known-to-fail +* +* check-error-start +varargs-format-position.c:5:29: warning: incorrect type in argument 3 (different types) +varargs-format-position.c:5:29: expected int +varargs-format-position.c:5:29: got long +varargs-format-position.c:5:12: warning: format 3: position: no position specified +varargs-format-position.c:5:29: warning: incorrect type in argument 3 (different types) +varargs-format-position.c:5:29: expected unsigned int +varargs-format-position.c:5:29: got long +varargs-format-position.c:6:12: warning: no argument at position '4' +varargs-format-position.c:6:31: warning: incorrect type in argument 3 (different types) +varargs-format-position.c:6:31: expected unsigned int +varargs-format-position.c:6:31: got int +varargs-format-position.c:7:27: warning: incorrect type in argument 2 (different types) +varargs-format-position.c:7:27: expected int +varargs-format-position.c:7:27: got long +* check-error-end +* +*/
validation/varargs-format-prefix.c new file +19 -0
@@ -0,0 +1,19 @@ + +extern int __attribute__((format (printf,1 ,2 )))variadic (char *msg, ...); + +static int test (void ) { +void __attribute__((noderef,address_space (1 ))) *a; + +variadic ("%s\n" , a); +} + +/* +* check-name: variadic formatting test prefix based __attribute__ +* check-command: sparse -Wformat $file +* +* check-error-start +varargs-format-prefix.c:7:26: warning: incorrect type in argument 2 (different address spaces) +varargs-format-prefix.c:7:26: expected char const * +varargs-format-prefix.c:7:26: got void [noderef] <asn:1> *a +* check-error-end +*/
validation/varargs-format-tests.c new file +55 -0
55 lines not on this page · raw message
validation/varargs-type-formattest.c new file +117 -0
117 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH 2/4 parse: initial parsing of __attribute__((format))
In reply to Ben DooksAdd code to parse the __attribute__((format)) used to indicate that a variadic function takes a printf-style format string and where those are. Save the data in ctype ready for checking when such an function is encoutered.
---
--- parse.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- symbol.h | 10 +++++-- 2 files changed, 88 insertions(+), 3 deletions(-)
parse.c +80 -1
@@ -85,7 +85,7 @@ static attr_t attribute_address_space, attribute_context, attribute_designated_init, attribute_transparent_union, ignore_attribute, - attribute_mode, attribute_force; + attribute_mode, attribute_force, attribute_format;typedef struct symbol *to_mode_t (struct symbol *);
@@ -120,6 +120,12 @@ static void asm_modifier(struct token *token, unsigned long *mods, unsigned long *mods |= mod; } +/* the types of formatting from __attribute__((format)) */ +enum { +FMT_PRINTF =0 , +FMT_SCANF , +}; +static struct symbol_op typedef_op = { .type =KW_MODIFIER , .declarator = storage_specifier,
@@ -377,6 +383,10 @@ static struct symbol_op attr_force_op = { .attribute = attribute_force, }; +static struct symbol_op attr_format_op = { + .attribute = attribute_format, +}; +static struct symbol_op address_space_op = { .attribute = attribute_address_space, };
@@ -436,6 +446,16 @@ static struct symbol_op mode_word_op = { .to_mode = to_word_mode }; +static struct symbol_op attr_printf_op = { + .type =KW_FORMAT , + .class =FMT_PRINTF , +}; + +static struct symbol_op attr_scanf_op = { + .type =KW_FORMAT , + .class =FMT_SCANF , +}; +/* * Define the keyword and their effects. * The entries in the 'typedef' and put in NS_TYPEDEF and
@@ -551,6 +571,9 @@ static struct init_keyword { D("pure", &attr_fun_op, .mods = MOD_PURE), A("const", &attr_fun_op, .mods = MOD_PURE), D("gnu_inline", &attr_fun_op, .mods = MOD_GNU_INLINE), +D ("format" , &attr_format_op), +D ("printf" , &attr_printf_op), +D ("scanf" , &attr_scanf_op),/* Modes */ D("mode", &mode_op),
@@ -1188,6 +1211,60 @@ static struct token *attribute_address_space(struct token *token, struct symbolreturn token; } +static int invalid_format_args (long long start,long long at) +{ +return start <0 || at <0 || start >USHRT_MAX || at >USHRT_MAX || + (start == at && start >0 ) || + (start ==0 && at ==0 ); +} + +static struct token *attribute_format (struct token *token,struct symbol *attr,struct decl_state *ctx) +{ +struct expression *args[3 ]; +struct symbol *fmt_sym =NULL ; + +/* expecting format ( type, start, va_args at) */ + + token =expect (token,'(' ,"after format attribute" ); +if (token_type (token) ==TOKEN_IDENT ) + fmt_sym =lookup_keyword (token->ident,NS_KEYWORD ); +if (fmt_sym) +if (!fmt_sym->op || fmt_sym->op->type !=KW_FORMAT ) + fmt_sym =NULL ; + + token =conditional_expression (token, &args[0 ]); + token =expect (token,',' ,"format attribute type" ); + token =conditional_expression (token, &args[1 ]); + token =expect (token,',' ,"format attribute type position" ); + token =conditional_expression (token, &args[2 ]); + token =expect (token,')' ,"format attribute arg position" ); + +if (!fmt_sym || !args[0 ] || !args[1 ] || !args[2 ]) { +warning (token->pos,"incorrect format attribute" ); + }else if (fmt_sym->op->class !=FMT_PRINTF ) { +/* skip anything that isn't printf for the moment */ +warning (token->pos,"only printf format attribute supported" ); + }else { +long long start, at; + + start =get_expression_value (args[2 ]); + at =get_expression_value (args[1 ]); + +if (invalid_format_args (start, at)) { +warning (token->pos,"bad format positions" ); + }else if (start ==0 ) { +/* nothing to do here, is va_list function */ + }else if (start < at) { +warning (token->pos,"format cannot be after va_args" ); + }else { + ctx->ctype.format.index = at; + ctx->ctype.format.first = start; + } + } + +return token; +} +static struct symbol *to_QI_mode (struct symbol *ctype) {if (ctype->ctype.base_type != &int_type)
@@ -2957,6 +3034,8 @@ struct token *external_declaration(struct token *token, struct symbol_list **lisif (!(decl->ctype.modifiers &MOD_STATIC )) decl->ctype.modifiers |=MOD_EXTERN ; + + base_type->ctype.format = decl->ctype.format; }else if (base_type == &void_ctype && !(decl->ctype.modifiers &MOD_EXTERN )) {sparse_error (token->pos,"void declaration" ); }
symbol.h +8 -2
@@ -82,8 +82,8 @@ enum keyword {KW_ASM =1 <<5 ,KW_MODE =1 <<6 ,KW_STATIC =1 <<7 , -// KW UNUSED = 1 << 8, - KW_EXACT = 1 << 9, +KW_EXACT =1 <<8 , + KW_FORMAT = 1 << 9, }; struct context {
@@ -95,12 +95,18 @@ extern struct context *alloc_context(void); DECLARE_PTR_LIST(context_list, struct context); +struct attr_format { +unsigned short index;/* index in argument list for format string */ +unsigned short first;/* where first variadic argument is */ +}; +struct ctype {struct symbol *base_type;unsigned long modifiers;unsigned long alignment;struct context_list *contexts;struct ident *as; +struct attr_format format; };struct decl_state {
Signature · 1 line
2.28.0
PATCH 3/4 add -Wformat
In reply to Ben DooksAdd option to enable/disable format checking (and default it to off)
---
--- options.c | 2 ++ options.h | 1 + sparse.1 | 10 ++++++++++ 3 files changed, 13 insertions(+)
options.c +2 -0
@@ -100,6 +100,7 @@ int Wdesignated_init = 1;int Wdo_while =0 ;int Wenum_mismatch =1 ;int Wexternal_function_has_definition =1 ; +int Wformat =0 ;int Wimplicit_int =1 ;int Winit_cstring =0 ;int Wint_to_pointer_cast =1 ;
@@ -840,6 +841,7 @@ static const struct flag warnings[] = { { "do-while", &Wdo_while }, { "enum-mismatch", &Wenum_mismatch }, { "external-function-has-definition", &Wexternal_function_has_definition }, + { "format", &Wformat }, { "implicit-int", &Wimplicit_int }, { "init-cstring", &Winit_cstring }, { "int-to-pointer-cast", &Wint_to_pointer_cast },
options.h +1 -0
@@ -99,6 +99,7 @@ extern int Wdesignated_init;extern int Wdo_while;extern int Wenum_mismatch;extern int Wexternal_function_has_definition; +extern int Wformat;extern int Wimplicit_int;extern int Winit_cstring;extern int Wint_to_pointer_cast;
sparse.1 +10 -0
@@ -257,6 +257,16 @@ Sparse issues these warnings by default. To turn them off, use \fB\-Wno\-external\-function\-has\-definition\fR. . .TP +.B \-Wformat +Warn about parameter mismatch to any variadic function which specifies +where the format string is specified with the +.BI __attribute__((format( type, message, va_start ))) +attribute. + +Sparse does not issue these warnings by default. To turn them on, use +\fB\-W-format\fR. +. +.TP .B \-Winit\-cstring Warn about initialization of a char array with a too long constant C string.
Signature · 1 line
2.28.0
PATCH 4/4 evaluate: check variadic argument types against formatting info
In reply to Ben DooksThe variadic argumnet code did not check any of the variadic arguments as it did not previously know the possible type. Now we have the possible formatting information stored in the ctype, we can do some checks on the printf formatting types.
---
--- Makefile | 1 + builtin.c | 2 +- evaluate.c | 14 +- evaluate.h | 10 +- verify-format.c | 496 ++++++++++++++++++++++++++++++++++++++++++++++++ verify-format.h | 6 + 6 files changed, 523 insertions(+), 6 deletions(-) create mode 100644 verify-format.c create mode 100644 verify-format.h
Makefile +1 -0
@@ -90,6 +90,7 @@ LIB_OBJS += target-xtensa.o LIB_OBJS += tokenize.o LIB_OBJS += unssa.o LIB_OBJS += utils.o +LIB_OBJS += verify-format.o PROGRAMS := PROGRAMS += compile
builtin.c +1 -1
@@ -396,7 +396,7 @@ static int eval_sync_compare_and_swap(struct expression *expr)if (!expr->ctype)// __sync_val_compare_and_swap() expr->ctype = ctype; -return evaluate_arguments (types, expr->args); +return evaluate_arguments (NULL , types, expr->args); err:sparse_error (arg->pos,"invalid type for argument %d:" , n);
evaluate.c +10 -4
@@ -42,6 +42,7 @@#include "symbol.h" #include "target.h" #include "expression.h" +#include "verify-format.h" struct symbol *current_fn;
@@ -1411,8 +1412,8 @@ static int whitelist_pointers(struct symbol *t1, struct symbol *t2)return !Wtypesign; } -static int check_assignment_types (struct symbol *target,struct expression **rp, -const char **typediff) +int check_assignment_types (struct symbol *target,struct expression **rp, +const char **typediff) {struct symbol *source =degenerate (*rp);struct symbol *t, *s;
@@ -2344,7 +2345,8 @@ static struct symbol *evaluate_alignof(struct expression *expr)return size_t_ctype; } -int evaluate_arguments (struct symbol_list *argtypes,struct expression_list *head) +int evaluate_arguments (struct symbol *fn,struct symbol_list *argtypes, +struct expression_list *head) {struct expression *expr;struct symbol *argtype;
@@ -2385,6 +2387,10 @@ int evaluate_arguments(struct symbol_list *argtypes, struct expression_list *heaNEXT_PTR_LIST (argtype); }END_FOR_EACH_PTR (expr);FINISH_PTR_LIST (argtype); + +if (fn && Wformat) +verify_format_attribute (fn, head); +return 1 ; }
@@ -3208,7 +3214,7 @@ static struct symbol *evaluate_call(struct expression *expr)if (!sym->op->args (expr))return NULL ; }else { -if (!evaluate_arguments (ctype->arguments, arglist)) +if (!evaluate_arguments (ctype, ctype->arguments, arglist))return NULL ; args =expression_list_size (expr->args); fnargs =symbol_list_size (ctype->arguments);
evaluate.h +9 -1
@@ -28,8 +28,16 @@ void evaluate_symbol_list(struct symbol_list *list);/// // evaluate the arguments of a function +// @fn: the symbol of the prototype // @argtypes: the list of the types in the prototype // @args: the list of the effective arguments -int evaluate_arguments (struct symbol_list *argtypes,struct expression_list *args); +int evaluate_arguments (struct symbol *fn,struct symbol_list *argtypes,struct expression_list *args); +/// +// check if assignment types are compatible +// @target: the target assignment +// @rp: the expression +// @typediff: the resulant message if different type +int check_assignment_types (struct symbol *target,struct expression **rp, +const char **typediff);#endif
verify-format.c new file +496 -0
496 lines not on this page · raw message
verify-format.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef VERIFY_FORMAT_H +#define VERIFY_FORMAT_H + +void verify_format_attribute (struct symbol *fn,struct expression_list *args); + +#endif
Signature · 1 line
2.28.0
Quoted 8 lines · Ben Dooks
Hi, this is the update set for the format attributes.
I think the only thing I'm still thinking about is whether to just merged patches 3 and 4.
branch:
https://gitlab.com/CodethinkLabs/sparse.git bjdooks/printf-v062
This looks all good. Thanks.
I still need to do some runtime checks but this will be for later.
-- Luc