From: Josh Poimboeuf <jpoimboe@kernel.org>
To: Sam James <sam@gentoo.org>
Cc: Peter Zijlstra <peterz@infradead.org>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] objtool: Fix calloc call for new -Walloc-size
Date: Thu, 9 Nov 2023 13:40:30 -0800 [thread overview]
Message-ID: <20231109214030.jxx44y3q4rxrltkw@treble> (raw)
In-Reply-To: <20231107205504.1470006-1-sam@gentoo.org>
On Tue, Nov 07, 2023 at 08:55:00PM +0000, Sam James wrote:
> 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>
> ---
> tools/objtool/check.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/objtool/check.c b/tools/objtool/check.c
> index e94756e09ca9..548ec3cd7c00 100644
> --- a/tools/objtool/check.c
> +++ b/tools/objtool/check.c
> @@ -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);
Thanks!
Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
Peter are you able to grab this or should I put it in my tree first?
--
Josh
next prev parent reply other threads:[~2023-11-09 21:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-07 20:55 Sam James
2023-11-09 21:40 ` Josh Poimboeuf [this message]
2023-11-17 9:30 ` Peter Zijlstra
2023-11-20 14:44 ` [tip: objtool/core] " tip-bot2 for Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231109214030.jxx44y3q4rxrltkw@treble \
--to=jpoimboe@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=sam@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®