lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 15 May 2017 14:43:26 +0800 From: Xunlei Pang <xlpang@...hat.com> To: linux-next@...r.kernel.org, akpm@...ux-foundation.org, Stephen Rothwell <sfr@...b.auug.org.au> Cc: linux-kernel@...r.kernel.org, Xunlei Pang <xlpang@...hat.com> Subject: [PATCH] crash: Fix linux-next build warning linux-next build (arm multi_v7_defconfig) produced this warning: In file included from include/asm-generic/bug.h:15:0, from arch/arm/include/asm/bug.h:59, from include/linux/bug.h:4, from include/linux/elfcore.h:5, from include/linux/crash_core.h:5, from kernel/crash_core.c:9: kernel/crash_core.c: In function 'vmcoreinfo_append_str': include/linux/kernel.h:757:16: warning: comparison of distinct pointer types lacks a cast (void) (&min1 == &min2); \ ^ include/linux/kernel.h:760:2: note: in expansion of macro '__min' __min(typeof(x), typeof(y), \ ^ kernel/crash_core.c:360:6: note: in expansion of macro 'min' r = min(r, VMCOREINFO_BYTES - vmcoreinfo_size); ^ This patch fixes it with an explicit "size_t" type-casting on VMCOREINFO_BYTES. Andrew will help merge it into commit fc7d2b44367f ("powerpc/fadump: use the correct VMCOREINFO_NOTE_SIZE for phdr") before sending it to stable. Signed-off-by: Xunlei Pang <xlpang@...hat.com> --- kernel/crash_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 4a4a4ba..6db80fc 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -357,7 +357,7 @@ void vmcoreinfo_append_str(const char *fmt, ...) r = vscnprintf(buf, sizeof(buf), fmt, args); va_end(args); - r = min(r, VMCOREINFO_BYTES - vmcoreinfo_size); + r = min(r, (size_t)VMCOREINFO_BYTES - vmcoreinfo_size); memcpy(&vmcoreinfo_data[vmcoreinfo_size], buf, r); -- 1.8.3.1
Powered by blists - more mailing lists