Skip to content

Commit 553e41d

Browse files
Greg Ungererkees
authored andcommitted
binfmt_elf_fdpic: clean up debug warnings
The binfmt_elf_fdpic loader has some debug trace that can be enabled at build time. The recent 64-bit additions cause some warnings if that debug is enabled, such as: fs/binfmt_elf_fdpic.c: In function ‘elf_fdpic_map_file’: fs/binfmt_elf_fdpic.c:46:33: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘Elf64_Addr’ {aka ‘long long unsigned int’} [-Wformat=] 46 | #define kdebug(fmt, ...) printk("FDPIC "fmt"\n" ,##__VA_ARGS__ ) | ^~~~~~~~ ./include/linux/printk.h:427:25: note: in definition of macro ‘printk_index_wrap’ 427 | _p_func(_fmt, ##__VA_ARGS__); \ | ^~~~ Cast values to the largest possible type (which is equivilent to unsigned long long in this case) and use appropriate format specifiers to match. Fixes: b922bf0 ("binfmt_elf_fdpic: support 64-bit systems") Signed-off-by: Greg Ungerer <gerg@kernel.org> Link: https://lore.kernel.org/r/20230927132933.3290734-1-gerg@kernel.org Signed-off-by: Kees Cook <keescook@chromium.org>
1 parent 2632bb8 commit 553e41d

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

fs/binfmt_elf_fdpic.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -900,10 +900,12 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
900900
kdebug("- DYNAMIC[]: %lx", params->dynamic_addr);
901901
seg = loadmap->segs;
902902
for (loop = 0; loop < loadmap->nsegs; loop++, seg++)
903-
kdebug("- LOAD[%d] : %08x-%08x [va=%x ms=%x]",
903+
kdebug("- LOAD[%d] : %08llx-%08llx [va=%llx ms=%llx]",
904904
loop,
905-
seg->addr, seg->addr + seg->p_memsz - 1,
906-
seg->p_vaddr, seg->p_memsz);
905+
(unsigned long long) seg->addr,
906+
(unsigned long long) seg->addr + seg->p_memsz - 1,
907+
(unsigned long long) seg->p_vaddr,
908+
(unsigned long long) seg->p_memsz);
907909

908910
return 0;
909911

@@ -1082,9 +1084,10 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
10821084
maddr = vm_mmap(file, maddr, phdr->p_memsz + disp, prot, flags,
10831085
phdr->p_offset - disp);
10841086

1085-
kdebug("mmap[%d] <file> sz=%lx pr=%x fl=%x of=%lx --> %08lx",
1086-
loop, phdr->p_memsz + disp, prot, flags,
1087-
phdr->p_offset - disp, maddr);
1087+
kdebug("mmap[%d] <file> sz=%llx pr=%x fl=%x of=%llx --> %08lx",
1088+
loop, (unsigned long long) phdr->p_memsz + disp,
1089+
prot, flags, (unsigned long long) phdr->p_offset - disp,
1090+
maddr);
10881091

10891092
if (IS_ERR_VALUE(maddr))
10901093
return (int) maddr;
@@ -1146,8 +1149,9 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
11461149

11471150
#else
11481151
if (excess > 0) {
1149-
kdebug("clear[%d] ad=%lx sz=%lx",
1150-
loop, maddr + phdr->p_filesz, excess);
1152+
kdebug("clear[%d] ad=%llx sz=%lx", loop,
1153+
(unsigned long long) maddr + phdr->p_filesz,
1154+
excess);
11511155
if (clear_user((void *) maddr + phdr->p_filesz, excess))
11521156
return -EFAULT;
11531157
}

0 commit comments

Comments
 (0)