RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

policycoreutils/hll/pp: add printf format attribute to relevant functions 

log_err, cil_printf and cil_println use printf formats to process their
arguments.  Use __attribute__((format(printf,...))) to make "gcc
-Wformat -Wformat-security" detect issues.

This detected this issue several times on a x86_64 system:

  format '%lx' expects argument of type 'long unsigned int', but
  argument has type 'uint32_t'

Fix this by introducing an explicit cast to unsigned long.

While at it, constify the format string argument of each function.

Acked-by: Steve Lawrence <slawrence@tresys.com>
This commit is contained in:
Nicolas Iooss 2014-09-14 23:41:37 +02:00 committed by Steve Lawrence
parent e198427fe5
commit 3642a57cd0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
policycoreutils/hll/pp/pp.c
View File

@ -54,7 +54,8 @@ FILE *out_file;
#define DEFAULT_LEVEL "systemlow" #define DEFAULT_LEVEL "systemlow"
#define DEFAULT_OBJECT "object_r" #define DEFAULT_OBJECT "object_r"
static void log_err(char *fmt, ...) __attribute__ ((format(printf, 1, 2)))
static void log_err(const char *fmt, ...)
{ {
va_list argptr; va_list argptr;
va_start(argptr, fmt); va_start(argptr, fmt);
@ -75,7 +76,8 @@ static void cil_indent(int indent)
} }
} }
static void cil_printf(char *fmt, ...) { __attribute__ ((format(printf, 1, 2)))
static void cil_printf(const char *fmt, ...) {
va_list argptr; va_list argptr;
va_start(argptr, fmt); va_start(argptr, fmt);
if (vfprintf(out_file, fmt, argptr) < 0) { if (vfprintf(out_file, fmt, argptr) < 0) {
@ -85,7 +87,8 @@ static void cil_printf(char *fmt, ...) {
va_end(argptr); va_end(argptr);
} }
static void cil_println(int indent, char *fmt, ...) __attribute__ ((format(printf, 2, 3)))
static void cil_println(int indent, const char *fmt, ...)
{ {
cil_indent(indent); cil_indent(indent);
va_list argptr; va_list argptr;
@ -2200,9 +2203,9 @@ static int ocontext_xen_iomem_to_cil(struct policydb *pdb, struct ocontext *iome
high = iomem->u.iomem.high_iomem; high = iomem->u.iomem.high_iomem;
if (low == high) { if (low == high) {
cil_printf("(iomemcon %#lX ", low); cil_printf("(iomemcon %#lX ", (unsigned long)low);
} else { } else {
cil_printf("(iomemcon (%#lX %#lX) ", low, high); cil_printf("(iomemcon (%#lX %#lX) ", (unsigned long)low, (unsigned long)high);
} }
context_to_cil(pdb, &iomem->context[0]); context_to_cil(pdb, &iomem->context[0]);
@ -2218,7 +2221,7 @@ static int ocontext_xen_pcidevice_to_cil(struct policydb *pdb, struct ocontext *
struct ocontext *pcid; struct ocontext *pcid;
for (pcid = pcids; pcid != NULL; pcid = pcid->next) { for (pcid = pcids; pcid != NULL; pcid = pcid->next) {
cil_printf("(pcidevicecon %#lx ", pcid->u.device); cil_printf("(pcidevicecon %#lx ", (unsigned long)pcid->u.device);
context_to_cil(pdb, &pcid->context[0]); context_to_cil(pdb, &pcid->context[0]);
cil_printf(")\n"); cil_printf(")\n");
} }