From: Song Liu <song@kernel.org>
To: Florent Revest <revest@chromium.org>
Cc: bpf <bpf@vger.kernel.org>, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
KP Singh <kpsingh@kernel.org>,
jackmanb@google.com, open list <linux-kernel@vger.kernel.org>,
kernel test robot <lkp@intel.com>
Subject: Re: [PATCH bpf 2/2] bpf: Avoid using ARRAY_SIZE on an uninitialized pointer
Date: Mon, 17 May 2021 10:54:49 -0700 [thread overview]
Message-ID: <CAPhsuW4dk71WPyFgoQdLJj-0h3994jRC750F=M4WJS7cDAUtEw@mail.gmail.com> (raw)
In-Reply-To: <20210517092830.1026418-2-revest@chromium.org>
On Mon, May 17, 2021 at 2:29 AM Florent Revest <revest@chromium.org> wrote:
>
> The cppcheck static code analysis reported the following error:
> >> helpers.c:713:43: warning: Uninitialized variable: bufs [uninitvar]
> if (WARN_ON_ONCE(nest_level > ARRAY_SIZE(bufs->tmp_bufs))) {
> ^
>
> ARRAY_SIZE is a macro that expands to sizeofs, so bufs is not actually
> dereferenced at runtime, and the code is actually safe. But to keep
> things tidy, this patch removes the need for a call to ARRAY_SIZE by
> extracting the size of the array into a macro. Cppcheck should no longer
> be confused and the code ends up being a bit cleaner.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Florent Revest <revest@chromium.org>
Acked-by: Song Liu <song@kernel.org>
> ---
> kernel/bpf/helpers.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
> index 3a5ab614cbb0..73443498d88f 100644
> --- a/kernel/bpf/helpers.c
> +++ b/kernel/bpf/helpers.c
> @@ -698,8 +698,9 @@ static int bpf_trace_copy_string(char *buf, void *unsafe_ptr, char fmt_ptype,
> #define MAX_BPRINTF_BUF_LEN 512
>
> /* Support executing three nested bprintf helper calls on a given CPU */
> +#define MAX_BPRINTF_NEST_LEVEL 3
> struct bpf_bprintf_buffers {
> - char tmp_bufs[3][MAX_BPRINTF_BUF_LEN];
> + char tmp_bufs[MAX_BPRINTF_NEST_LEVEL][MAX_BPRINTF_BUF_LEN];
> };
> static DEFINE_PER_CPU(struct bpf_bprintf_buffers, bpf_bprintf_bufs);
> static DEFINE_PER_CPU(int, bpf_bprintf_nest_level);
> @@ -711,7 +712,7 @@ static int try_get_fmt_tmp_buf(char **tmp_buf)
>
> preempt_disable();
> nest_level = this_cpu_inc_return(bpf_bprintf_nest_level);
> - if (WARN_ON_ONCE(nest_level > ARRAY_SIZE(bufs->tmp_bufs))) {
> + if (WARN_ON_ONCE(nest_level > MAX_BPRINTF_NEST_LEVEL)) {
> this_cpu_dec(bpf_bprintf_nest_level);
> preempt_enable();
> return -EBUSY;
> --
> 2.31.1.751.gd2f1c929bd-goog
>
next prev parent reply other threads:[~2021-05-17 17:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 9:28 [PATCH bpf 1/2] bpf: Clarify a bpf_bprintf_prepare macro Florent Revest
2021-05-17 9:28 ` [PATCH bpf 2/2] bpf: Avoid using ARRAY_SIZE on an uninitialized pointer Florent Revest
2021-05-17 17:54 ` Song Liu [this message]
2021-05-17 17:54 ` [PATCH bpf 1/2] bpf: Clarify a bpf_bprintf_prepare macro Song Liu
2021-05-17 18:10 ` patchwork-bot+netdevbpf
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='CAPhsuW4dk71WPyFgoQdLJj-0h3994jRC750F=M4WJS7cDAUtEw@mail.gmail.com' \
--to=song@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jackmanb@google.com \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@intel.com \
--cc=revest@chromium.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®