x86/tools/relocs: add __printf attribute to die()
PATCH 1/1 x86/tools/relocs: add __printf attribute to die()
There are a number of printf "mismatches" in the use of die() in x86/tools/relocs.c. Fix them up and add the printf attribute to the reloc.h header file to prevent them from ever coming back.
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/x86/tools/relocs.c | 21 +++++++++++---------- arch/x86/tools/relocs.h | 1 + 2 files changed, 12 insertions(+), 10 deletions(-)
arch/x86/tools/relocs.c +11 -10
@@ -389,7 +389,8 @@ static void read_ehdr(FILE *fp)Elf_Shdr shdr;if (fseek (fp, ehdr.e_shoff,SEEK_SET ) <0 ) -die ("Seek to %d failed: %s\n" , ehdr.e_shoff,strerror (errno)); +die ("Seek to %d failed: %s\n" , + (int )ehdr.e_shoff,strerror (errno));if (fread (&shdr,sizeof (shdr),1 , fp) !=1 )die ("Cannot read initial ELF section header: %s\n" ,strerror (errno));
@@ -412,17 +413,17 @@ static void read_shdrs(FILE *fp) secs =calloc (shnum,sizeof (struct section ));if (!secs) { -die ("Unable to allocate %d section headers\n" , +die ("Unable to allocate %ld section headers\n" , shnum); }if (fseek (fp, ehdr.e_shoff,SEEK_SET ) <0 ) {die ("Seek to %d failed: %s\n" , - ehdr.e_shoff,strerror (errno)); + (int )ehdr.e_shoff,strerror (errno)); }for (i =0 ; i < shnum; i++) {struct section *sec = &secs[i];if (fread (&shdr,sizeof (shdr),1 , fp) !=1 ) -die ("Cannot read ELF section headers %d/%d: %s\n" , +die ("Cannot read ELF section headers %d/%ld: %s\n" , i, shnum,strerror (errno)); sec->shdr.sh_name =elf_word_to_cpu (shdr.sh_name); sec->shdr.sh_type =elf_word_to_cpu (shdr.sh_type);
@@ -451,11 +452,11 @@ static void read_strtabs(FILE *fp) sec->strtab =malloc (sec->shdr.sh_size);if (!sec->strtab) {die ("malloc of %d bytes for strtab failed\n" , - sec->shdr.sh_size); + (int )sec->shdr.sh_size); }if (fseek (fp, sec->shdr.sh_offset,SEEK_SET ) <0 ) {die ("Seek to %d failed: %s\n" , - sec->shdr.sh_offset,strerror (errno)); + (int )sec->shdr.sh_offset,strerror (errno)); }if (fread (sec->strtab,1 , sec->shdr.sh_size, fp) != sec->shdr.sh_size) {
@@ -476,11 +477,11 @@ static void read_symtabs(FILE *fp) sec->symtab =malloc (sec->shdr.sh_size);if (!sec->symtab) {die ("malloc of %d bytes for symtab failed\n" , - sec->shdr.sh_size); + (int )sec->shdr.sh_size); }if (fseek (fp, sec->shdr.sh_offset,SEEK_SET ) <0 ) {die ("Seek to %d failed: %s\n" , - sec->shdr.sh_offset,strerror (errno)); + (int )sec->shdr.sh_offset,strerror (errno)); }if (fread (sec->symtab,1 , sec->shdr.sh_size, fp) != sec->shdr.sh_size) {
@@ -509,11 +510,11 @@ static void read_relocs(FILE *fp) sec->reltab =malloc (sec->shdr.sh_size);if (!sec->reltab) {die ("malloc of %d bytes for relocs failed\n" , - sec->shdr.sh_size); + (int )sec->shdr.sh_size); }if (fseek (fp, sec->shdr.sh_offset,SEEK_SET ) <0 ) {die ("Seek to %d failed: %s\n" , - sec->shdr.sh_offset,strerror (errno)); + (int )sec->shdr.sh_offset,strerror (errno)); }if (fread (sec->reltab,1 , sec->shdr.sh_size, fp) != sec->shdr.sh_size) {
arch/x86/tools/relocs.h +1 -0
@@ -17,6 +17,7 @@#include <regex.h> #include <tools/le_byteshift.h> +__attribute__((__format__ (printf,1 ,2 )))void die (char *fmt, ...) __attribute__((noreturn));#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0]))
Signature · 1 line
2.30.1