From 8189230d80ec109e4d228e5fd72404a38cfea96f Mon Sep 17 00:00:00 2001 From: Nicola Vetrini Date: Thu, 25 Apr 2024 09:48:11 +0200 Subject: [PATCH] libelf: address violations of MISRA C Rule 20.7 MISRA C Rule 20.7 states: "Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses". Therefore, some macro definitions should gain additional parentheses to ensure that all current and future users will be safe with respect to expansions that can possibly alter the semantics of the passed-in macro parameter. No functional change. Signed-off-by: Nicola Vetrini Acked-by: Jan Beulich --- xen/common/libelf/libelf-private.h | 2 +- xen/include/xen/libelf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/libelf/libelf-private.h b/xen/common/libelf/libelf-private.h index 98cac65bc5..197d7a7623 100644 --- a/xen/common/libelf/libelf-private.h +++ b/xen/common/libelf/libelf-private.h @@ -26,7 +26,7 @@ /* we would like to use elf->log_callback but we can't because * there is no vprintk in Xen */ #define elf_msg(elf, fmt, args ... ) \ - if (elf->verbose) printk(fmt, ## args ) + if ((elf)->verbose) printk(fmt, ## args ) #define elf_err(elf, fmt, args ... ) \ printk(fmt, ## args ) diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h index 9ac530acc2..a0675a4dc3 100644 --- a/xen/include/xen/libelf.h +++ b/xen/include/xen/libelf.h @@ -288,7 +288,7 @@ bool elf_access_ok(struct elf_binary * elf, #define elf_store_val(elf, type, ptr, val) \ ({ \ typeof(type) elf_store__val = (val); \ - elf_ptrval elf_store__targ = ptr; \ + elf_ptrval elf_store__targ = (ptr); \ if (elf_access_ok((elf), elf_store__targ, \ sizeof(elf_store__val))) { \ elf_memcpy_unchecked((void*)elf_store__targ, &elf_store__val, \