mirror of
https://github.com/torvalds/linux
synced 2024-07-21 18:51:47 +00:00
objtool: Fix calloc call for new -Walloc-size
GCC 14 introduces a new -Walloc-size included in -Wextra which errors out like: ``` check.c: In function ‘cfi_alloc’: check.c:294:33: error: allocation of insufficient size ‘1’ for type ‘struct cfi_state’ with size ‘320’ [-Werror=alloc-size] 294 | struct cfi_state *cfi = calloc(sizeof(struct cfi_state), 1); | ^~~~~~ ``` The calloc prototype is: ``` void *calloc(size_t nmemb, size_t size); ``` So, just swap the number of members and size arguments to match the prototype, as we're initialising 1 struct of size `sizeof(struct ...)`. GCC then sees we're not doing anything wrong. Signed-off-by: Sam James <sam@gentoo.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Josh Poimboeuf <jpoimboe@kernel.org> Link: https://lore.kernel.org/r/20231107205504.1470006-1-sam@gentoo.org
This commit is contained in:
parent
b85ea95d08
commit
e2e13630f9
|
@ -291,7 +291,7 @@ static void init_insn_state(struct objtool_file *file, struct insn_state *state,
|
|||
|
||||
static struct cfi_state *cfi_alloc(void)
|
||||
{
|
||||
struct cfi_state *cfi = calloc(sizeof(struct cfi_state), 1);
|
||||
struct cfi_state *cfi = calloc(1, sizeof(struct cfi_state));
|
||||
if (!cfi) {
|
||||
WARN("calloc failed");
|
||||
exit(1);
|
||||
|
|
Loading…
Reference in a new issue