The following commit has been merged into the x86/vdso branch of tip: Commit-ID: 70c9d959226b7c5c48c119e2c1cfc1424f87b023 Gitweb: https://git.kernel.org/tip/70c9d959226b7c5c48c119e2c1cfc1424f87b023 Author: Jiri Slaby <jslaby@xxxxxxx> AuthorDate: Wed, 03 Mar 2021 07:43:57 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Sat, 06 Mar 2021 11:34:07 +01:00 x86/vdso: Use proper modifier for len's format specifier in extract() Commit 8382c668ce4f ("x86/vdso: Add support for exception fixup in vDSO functions") prints length "len" which is size_t. Compilers now complain when building on a 32-bit host: HOSTCC arch/x86/entry/vdso/vdso2c ... In file included from arch/x86/entry/vdso/vdso2c.c:162: arch/x86/entry/vdso/vdso2c.h: In function 'extract64': arch/x86/entry/vdso/vdso2c.h:38:52: warning: format '%lu' expects argument of \ type 'long unsigned int', but argument 4 has type 'size_t' {aka 'unsigned int'} So use proper modifier (%zu) for size_t. [ bp: Massage commit message. ] Fixes: 8382c668ce4f ("x86/vdso: Add support for exception fixup in vDSO functions") Signed-off-by: Jiri Slaby <jslaby@xxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Acked-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20210303064357.17056-1-jslaby@xxxxxxx --- arch/x86/entry/vdso/vdso2c.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/entry/vdso/vdso2c.h b/arch/x86/entry/vdso/vdso2c.h index 1c7cfac..5264daa 100644 --- a/arch/x86/entry/vdso/vdso2c.h +++ b/arch/x86/entry/vdso/vdso2c.h @@ -35,7 +35,7 @@ static void BITSFUNC(extract)(const unsigned char *data, size_t data_len, if (offset + len > data_len) fail("section to extract overruns input data"); - fprintf(outfile, "static const unsigned char %s[%lu] = {", name, len); + fprintf(outfile, "static const unsigned char %s[%zu] = {", name, len); BITSFUNC(copy)(outfile, data + offset, len); fprintf(outfile, "\n};\n\n"); }
![]() |