x86/tools/relocs: add __printf attribute to die()
PATCH RESEND 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.
--- arch/x86/tools/relocs.c | 21 +++++++++++---------- arch/x86/tools/relocs.h | 1 + 2 files changed, 12 insertions(+), 10 deletions(-)
Originally sent back in Feb, but it seems to have been missed:
https://lore.kernel.org/r/[email protected]
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
Borislav Petkov
maintainerQuoted 24 lines · Greg Kroah-Hartman
There are a number of printf "mismatches" in the use of
die()inx86/tools/relocs.c. Fix them up and add the printf attribute to thereloc.hheader 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(-)Originally sent back in Feb, but it seems to have been missed:
https://lore.kernel.org/r/[email protected]arch/x86/tools/relocs.c +0
-0
arch/x86/tools/relocs.c static void read_ehdr(FILE *fp) · line 393
Quoted 6 lines
arch/x86/tools/relocs.c +2
-1@@ -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));
Instead of casting all those, I think you should use %zu as, apparently, we're using unsigned types for Elf{32,64}_Off and Elf{32,64}_Xword, etc.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 27 lines · Borislav Petkov
Quoted 26 lines · Greg Kroah-Hartman
There are a number of printf "mismatches" in the use of
die()inx86/tools/relocs.c. Fix them up and add the printf attribute to thereloc.hheader 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(-)Originally sent back in Feb, but it seems to have been missed:
https://lore.kernel.org/r/[email protected]arch/x86/tools/relocs.c +0
-0@@ -389,7 +389,8 @@ static void read_ehdr(FILE *fp)Elf_Shdr shdr;
Quoted 7 lines
arch/x86/tools/relocs.c static void read_ehdr(FILE *fp) · line 393
Quoted 4 lines
arch/x86/tools/relocs.c +2
-1if (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));Instead of casting all those, I think you should use %zu as, apparently, we're using unsigned types for Elf{32,64}_Off and Elf{32,64}_Xword, etc.
Odd, I thought I tried that and something did not work. Let me try it again...
H. Peter Anvin
reviewer%zu wouldn't DTRT for cross build.
Quoted 42 lines · Greg Kroah-Hartman
Quoted 3 lines · Borislav Petkov
Quoted 2 lines · Greg Kroah-Hartman
There are a number of printf "mismatches" in the use of
die()inx86/tools/relocs.c. Fix them up and add the printf attribute tothe
Quoted 13 lines
Quoted 13 lines
reloc.hheader 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(-)Quoted 2 lines
Quoted 2 lines
Originally sent back in Feb, but it seems to have been missed:
https://lore.kernel.org/r/[email protected]Quoted 9 lines
Quoted 9 lines
arch/x86/tools/relocs.c +0
-0@@ -389,7 +389,8 @@ static void read_ehdr(FILE *fp)Elf_Shdr shdr;Quoted 6 lines
arch/x86/tools/relocs.c static void read_ehdr(FILE *fp) · line 393
Quoted 4 lines
arch/x86/tools/relocs.c +2
-1if (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));Instead of casting all those, I think you should use %zu as,
apparently,
Quoted 1 line
we're using unsigned types for Elf{32,64}_Off and Elf{32,64}_Xword,
etc.
Odd, I thought I tried that and something did not work. Let me try it again...
Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.
Quoted 27 lines · Borislav Petkov
Quoted 26 lines · Greg Kroah-Hartman
There are a number of printf "mismatches" in the use of
die()inx86/tools/relocs.c. Fix them up and add the printf attribute to thereloc.hheader 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(-)Originally sent back in Feb, but it seems to have been missed:
https://lore.kernel.org/r/[email protected]arch/x86/tools/relocs.c +0
-0@@ -389,7 +389,8 @@ static void read_ehdr(FILE *fp)Elf_Shdr shdr;
Quoted 7 lines
arch/x86/tools/relocs.c static void read_ehdr(FILE *fp) · line 393
Quoted 4 lines
arch/x86/tools/relocs.c +2
-1if (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));Instead of casting all those, I think you should use %zu as, apparently, we're using unsigned types for Elf{32,64}_Off and Elf{32,64}_Xword, etc.
Ah, that does not work, I tried it and I get:
arch/x86/tools/relocs.c: In function ‘read_ehdr’:arch/x86/tools/relocs.c:392:40: warning: format ‘%zu’ expects argument of type ‘size_t’, but argument 2 has type ‘Elf32_Off’ {aka ‘unsigned int’} [-Wformat=]
392 | die("Seek to %zu failed: %s\n",
| ~~^
| |
| long unsigned int
| %u
393 | ehdr.e_shoff, strerror(errno));
| ~~~~~~~~~~~~
| |
| Elf32_Off {aka unsigned int}Casting seems to be the only way to make this "quiet" that I can tell.
Unless someone else has a good idea?
thanks,
greg k-h
Borislav Petkov
maintainerQuoted 3 lines · Greg Kroah-Hartman
Casting seems to be the only way to make this "quiet" that I can tell.
Unless someone else has a good idea?
Hmm, so in Documentation/core-api/printk-formats.rst we say that for printk() with different size types, we should "use a format specifier of its largest possible type and explicitly cast to it."
And that kinda sounds ok to me because we don't potentially lose through the casting.
IOW, I guess something like this below.
---
arch/x86/tools/relocs.c +17 -17
@@ -389,7 +389,7 @@ 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 %lu failed: %s\n" , (unsigned long )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 +412,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)); +die ("Seek to %lu failed: %s\n" , + (unsigned long )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);
@@ -450,12 +450,12 @@ 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); +die ("malloc of %lu bytes for strtab failed\n" , + (unsigned long )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)); +die ("Seek to %lu failed: %s\n" , + (unsigned long )sec->shdr.sh_offset,strerror (errno)); }if (fread (sec->strtab,1 , sec->shdr.sh_size, fp) != sec->shdr.sh_size) {
@@ -475,12 +475,12 @@ 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); +die ("malloc of %lu bytes for symtab failed\n" , + (unsigned long )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)); +die ("Seek to %lu failed: %s\n" , + (unsigned long )sec->shdr.sh_offset,strerror (errno)); }if (fread (sec->symtab,1 , sec->shdr.sh_size, fp) != sec->shdr.sh_size) {
@@ -508,12 +508,12 @@ 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); +die ("malloc of %lu bytes for relocs failed\n" , + (unsigned long )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)); +die ("Seek to %lu failed: %s\n" , + (unsigned long )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 · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteH. Peter Anvin
reviewerThis is a user space build time tool.
You can use PRIu32/64 or cast to unsigned long long; it's not like the performance for this case is going to matter one iota.
Quoted 118 lines · Borislav Petkov
Quoted 1 line · Greg Kroah-Hartman
Casting seems to be the only way to make this "quiet" that I can
tell.
Quoted 2 lines
Unless someone else has a good idea?
Hmm, so in
Documentation/core-api/printk-formats.rstwe say that forprintk()with different size types, we should "use a format specifier of
its largest possible type and explicitly cast to it."And that kinda sounds ok to me because we don't potentially lose through
the casting.IOW, I guess something like this below.
---
arch/x86/tools/relocs.c +1
-1@@ -389,7 +389,7 @@ 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 %lu failed: %s\n" , (unsigned long )ehdr.e_shoff,strerror (errno));if (fread (&shdr,sizeof (shdr),1 , fp) !=1 )die("Cannot read initial ELF section header: %s\n",
strerror(errno));arch/x86/tools/relocs.c +16
-16@@ -412,17 +412,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)); +die ("Seek to %lu failed: %s\n" , + (unsigned long )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);@@ -450,12 +450,12 @@ 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); +die ("malloc of %lu bytes for strtab failed\n" , + (unsigned long )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)); +die ("Seek to %lu failed: %s\n" , + (unsigned long )sec->shdr.sh_offset,strerror (errno)); }if (fread (sec->strtab,1 , sec->shdr.sh_size, fp) != sec->shdr.sh_size) {@@ -475,12 +475,12 @@ 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); +die ("malloc of %lu bytes for symtab failed\n" , + (unsigned long )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)); +die ("Seek to %lu failed: %s\n" , + (unsigned long )sec->shdr.sh_offset,strerror (errno)); }if (fread (sec->symtab,1 , sec->shdr.sh_size, fp) != sec->shdr.sh_size) {@@ -508,12 +508,12 @@ 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); +die ("malloc of %lu bytes for relocs failed\n" , + (unsigned long )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)); +die ("Seek to %lu failed: %s\n" , + (unsigned long )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
Sent from my Android device with K-9 Mail. Please excuse my brevity.
Borislav Petkov
maintainerQuoted 2 lines · H. Peter Anvin
You can use PRIu32/64 or cast to unsigned long long; it's not like the performance for this case is going to matter one iota.
Why "unsigned long long"?
Those fields are typedeffed as:
typedef __u32 Elf32_Off;
or
typedef __u64 Elf64_Off;
respectively so they should fit in an "unsigned long" on the respective width.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteH. Peter Anvin
reviewer64-bit cross build on a 32-bit platform... or Windows.
Quoted 17 lines · Borislav Petkov
Quoted 1 line · H. Peter Anvin
You can use PRIu32/64 or cast to unsigned long long; it's not like
the
Quoted 1 line
performance for this case is going to matter one iota.
Why "unsigned long long"?
Those fields are typedeffed as:
typedef
__u32Elf32_Off;or
typedef
__u64Elf64_Off;respectively so they should fit in an "unsigned long" on the respective width.
Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.
Borislav Petkov
maintainerQuoted 1 line · H. Peter Anvin
64-bit cross build on a 32-bit platform... or Windows.
Meh, nobody cares about those... :)
Hmm, so looking at the PRI* inttypes.h things again, they're C99 and they kinda look more elegant as they don't make us cast stuff.
So how does that look?
---
arch/x86/tools/relocs.c +20 -17
@@ -26,6 +26,9 @@ static struct relocs relocs32;#if ELF_BITS ==64 static struct relocs relocs32neg;static struct relocs relocs64; +#define FMT PRIu64 +#else +#define FMT PRIu32#endif struct section {
@@ -389,7 +392,7 @@ 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 %" FMT " failed: %s\n" , 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 +415,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)); +die ("Seek to %" FMT " failed: %s\n" , + 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);
@@ -450,12 +453,12 @@ 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); +die ("malloc of %" FMT " bytes for strtab failed\n" , + 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)); +die ("Seek to %" FMT " failed: %s\n" , + sec->shdr.sh_offset,strerror (errno)); }if (fread (sec->strtab,1 , sec->shdr.sh_size, fp) != sec->shdr.sh_size) {
@@ -475,12 +478,12 @@ 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); +die ("malloc of %" FMT " bytes for symtab failed\n" , + 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)); +die ("Seek to %" FMT " failed: %s\n" , + sec->shdr.sh_offset,strerror (errno)); }if (fread (sec->symtab,1 , sec->shdr.sh_size, fp) != sec->shdr.sh_size) {
@@ -508,12 +511,12 @@ 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); +die ("malloc of %" FMT " bytes for relocs failed\n" , + 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)); +die ("Seek to %" FMT " failed: %s\n" , + 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 · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 17 lines · Borislav Petkov
Quoted 1 line · H. Peter Anvin
64-bit cross build on a 32-bit platform... or Windows.
Meh, nobody cares about those... :)
Hmm, so looking at the PRI*
inttypes.hthings again, they're C99 and they kinda look more elegant as they don't make us cast stuff.So how does that look?
---
arch/x86/tools/relocs.c +0
-0
arch/x86/tools/relocs.c static struct relocs relocs32; · line 32
Quoted 7 lines
arch/x86/tools/relocs.c +3
-0@@ -26,6 +26,9 @@ static struct relocs relocs32;#if ELF_BITS ==64 static struct relocs relocs32neg;static struct relocs relocs64; +#define FMT PRIu64 +#else +#define FMT PRIu32#endif
<snip>
This works for me! It should fix the static checking tool that keeps tripping over this pointless warning :)
Want to turn it into a real patch?
thanks,
greg k-h
Borislav Petkov
maintainerPATCH 1/1 x86/tools/relocs: Mark die() with the printf function attr format
Quoted 4 lines · Greg Kroah-Hartman
This works for me! It should fix the static checking tool that keeps tripping over this pointless warning :)
Want to turn it into a real patch?
How's that?
---
From: Borislav Petkov <[email protected]>
Mark die() as a function which accepts printf-style arguments so that the compiler can typecheck them against the supplied format string.
Use the C99 inttypes.h format specifiers as relocs.c gets built for both 32- and 64-bit.
Original version of the patch by Greg Kroah-Hartman <[email protected]>
--- arch/x86/tools/relocs.c | 37 ++++++++++++++++++++----------------- arch/x86/tools/relocs.h | 1 + 2 files changed, 21 insertions(+), 17 deletions(-)
arch/x86/tools/relocs.c +20 -17
@@ -26,6 +26,9 @@ static struct relocs relocs32;#if ELF_BITS ==64 static struct relocs relocs32neg;static struct relocs relocs64; +#define FMT PRIu64 +#else +#define FMT PRIu32#endif struct section {
@@ -389,7 +392,7 @@ 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 %" FMT " failed: %s\n" , 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 +415,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)); +die ("Seek to %" FMT " failed: %s\n" , + 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);
@@ -450,12 +453,12 @@ 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); +die ("malloc of %" FMT " bytes for strtab failed\n" , + 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)); +die ("Seek to %" FMT " failed: %s\n" , + sec->shdr.sh_offset,strerror (errno)); }if (fread (sec->strtab,1 , sec->shdr.sh_size, fp) != sec->shdr.sh_size) {
@@ -475,12 +478,12 @@ 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); +die ("malloc of %" FMT " bytes for symtab failed\n" , + 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)); +die ("Seek to %" FMT " failed: %s\n" , + sec->shdr.sh_offset,strerror (errno)); }if (fread (sec->symtab,1 , sec->shdr.sh_size, fp) != sec->shdr.sh_size) {
@@ -508,12 +511,12 @@ 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); +die ("malloc of %" FMT " bytes for relocs failed\n" , + 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)); +die ("Seek to %" FMT " failed: %s\n" , + 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 · 7 lines
2.29.2
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [PATCH] x86/tools/relocs: Mark die() with the printf function attr format
Quoted 17 lines · Borislav Petkov
Quoted 4 lines · Greg Kroah-Hartman
This works for me! It should fix the static checking tool that keeps tripping over this pointless warning :)
Want to turn it into a real patch?
How's that?
---
From: Borislav Petkov <[email protected]>Mark
die()as a function which accepts printf-style arguments so that the compiler can typecheck them against the supplied format string.Use the C99
inttypes.hformat specifiers asrelocs.cgets built for both 32- and 64-bit.
Quoted 7 lines
Original version of the patch by Greg Kroah-Hartman <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>--- arch/x86/tools/relocs.c | 37 ++++++++++++++++++++----------------- arch/x86/tools/relocs.h | 1 + 2 files changed, 21 insertions(+), 17 deletions(-)
[tip: x86/build] x86/tools/relocs: Mark die() with the printf function attr format
In reply to Borislav PetkovThe following commit has been merged into the x86/build branch of tip:
The following commit has been merged into the x86/build branch of tip:
Commit-ID: 03dca99e200f4d268f70079cf54e3b1200c9eb9d Gitweb: https://git.kernel.org/tip/03dca99e200f4d268f70079cf54e3b1200c9eb9d Author: Borislav Petkov <[email protected]> AuthorDate: Fri, 25 Jun 2021 17:10:16 +02:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Mon, 23 Aug 2021 05:58:02 +02:00
x86/tools/relocs: Mark die() with the printf function attr format
Mark die() as a function which accepts printf-style arguments so that the compiler can typecheck them against the supplied format string.
Use the C99 inttypes.h format specifiers as relocs.c gets built for both 32- and 64-bit.
Original version of the patch by Greg Kroah-Hartman <[email protected]>
--- arch/x86/tools/relocs.c | 37 ++++++++++++++++++++----------------- arch/x86/tools/relocs.h | 1 + 2 files changed, 21 insertions(+), 17 deletions(-)
arch/x86/tools/relocs.c +20 -17
@@ -26,6 +26,9 @@ static struct relocs relocs32;#if ELF_BITS ==64 static struct relocs relocs32neg;static struct relocs relocs64; +#define FMT PRIu64 +#else +#define FMT PRIu32#endif struct section {
@@ -389,7 +392,7 @@ 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 %" FMT " failed: %s\n" , 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 +415,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)); +die ("Seek to %" FMT " failed: %s\n" , + 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);
@@ -450,12 +453,12 @@ 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); +die ("malloc of %" FMT " bytes for strtab failed\n" , + 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)); +die ("Seek to %" FMT " failed: %s\n" , + sec->shdr.sh_offset,strerror (errno)); }if (fread (sec->strtab,1 , sec->shdr.sh_size, fp) != sec->shdr.sh_size) {
@@ -475,12 +478,12 @@ 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); +die ("malloc of %" FMT " bytes for symtab failed\n" , + 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)); +die ("Seek to %" FMT " failed: %s\n" , + sec->shdr.sh_offset,strerror (errno)); }if (fread (sec->symtab,1 , sec->shdr.sh_size, fp) != sec->shdr.sh_size) {
@@ -508,12 +511,12 @@ 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); +die ("malloc of %" FMT " bytes for relocs failed\n" , + 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)); +die ("Seek to %" FMT " failed: %s\n" , + 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]))