tequilaOS/platform_external_selinux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

checkpolicy: add printf format attribute to relevant functions

Browse source 
Once __attribute__ ((format(printf, 1, 2))) is added to yyerror2,
"gcc -Wformat -Wformat-security" shows some issues.  Fix them.

Acked-by: Steve Lawrence <slawrence@tresys.com>
This commit is contained in:
Nicolas Iooss 2014-09-14 23:41:38 +02:00 committed by Steve Lawrence
parent 3642a57cd0
commit 8db96d0cb4
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
checkpolicy/module_compiler.c
View file

@ -40,6 +40,7 @@ typedef struct scope_stack {
extern policydb_t *policydbp;
extern queue_t id_queue;
extern int yyerror(char *msg);
__attribute__ ((format(printf, 1, 2)))
extern void yyerror2(char *fmt, ...);
static int push_stack(int stack_type, ...);

15
checkpolicy/policy_define.c
View file

@ -81,6 +81,7 @@ void init_parser(int pass_number)
pass = pass_number;
}
__attribute__ ((format(printf, 1, 2)))
void yyerror2(char *fmt, ...)
{
va_list ap;
@ -3959,7 +3960,7 @@ int define_iomem_context(unsigned long low, unsigned long high)
newc->u.iomem.high_iomem = high;
if (low > high) {
yyerror2("low memory 0x%x exceeds high memory 0x%x", low, high);
yyerror2("low memory 0x%lx exceeds high memory 0x%lx", low, high);
free(newc);
return -1;
}
@ -3971,12 +3972,12 @@ int define_iomem_context(unsigned long low, unsigned long high)
head = policydbp->ocontexts[OCON_XEN_IOMEM];
for (l = NULL, c = head; c; l = c, c = c->next) {
unsigned int low2, high2;
uint32_t low2, high2;
low2 = c->u.iomem.low_iomem;
high2 = c->u.iomem.high_iomem;
if (low <= high2 && low2 <= high) {
yyerror2("iomemcon entry for 0x%x-0x%x overlaps with "
yyerror2("iomemcon entry for 0x%lx-0x%lx overlaps with "
"earlier entry 0x%x-0x%x", low, high,
low2, high2);
goto bad;
@ -4023,7 +4024,7 @@ int define_ioport_context(unsigned long low, unsigned long high)
newc->u.ioport.high_ioport = high;
if (low > high) {
yyerror2("low ioport 0x%x exceeds high ioport 0x%x", low, high);
yyerror2("low ioport 0x%lx exceeds high ioport 0x%lx", low, high);
free(newc);
return -1;
}
@ -4035,12 +4036,12 @@ int define_ioport_context(unsigned long low, unsigned long high)
head = policydbp->ocontexts[OCON_XEN_IOPORT];
for (l = NULL, c = head; c; l = c, c = c->next) {
unsigned int low2, high2;
uint32_t low2, high2;
low2 = c->u.ioport.low_ioport;
high2 = c->u.ioport.high_ioport;
if (low <= high2 && low2 <= high) {
yyerror2("ioportcon entry for 0x%x-0x%x overlaps with"
yyerror2("ioportcon entry for 0x%lx-0x%lx overlaps with"
"earlier entry 0x%x-0x%x", low, high,
low2, high2);
goto bad;
@ -4096,7 +4097,7 @@ int define_pcidevice_context(unsigned long device)
device2 = c->u.device;
if (device == device2) {
yyerror2("duplicate pcidevicecon entry for 0x%x ",
yyerror2("duplicate pcidevicecon entry for 0x%lx",
device);
goto bad;
}