From: Daniel Borkmann <daniel@iogearbox.net>
To: Kuniyuki Iwashima <kuniyu@amazon.com>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>
Cc: Kuniyuki Iwashima <kuni1840@gmail.com>,
bpf@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH v2 bpf] bpf: Fix a data-race around bpf_jit_limit.
Date: Tue, 23 Aug 2022 23:20:29 +0200 [thread overview]
Message-ID: <311e4686-a514-b210-080b-849d8d0ad5d3@iogearbox.net> (raw)
In-Reply-To: <20220823181247.90349-1-kuniyu@amazon.com>
On 8/23/22 8:12 PM, Kuniyuki Iwashima wrote:
> While reading bpf_jit_limit, it can be changed concurrently.
> Thus, we need to add READ_ONCE() to its reader.
For sake of a better/clearer commit message, please also provide data about the
WRITE_ONCE() pairing that this READ_ONCE() targets. This seems to be the case in
__do_proc_doulongvec_minmax() as far as I can see. For your 2nd sentence above
please also include load-tearing as main motivation for your fix.
> Fixes: ede95a63b5e8 ("bpf: add bpf_jit_limit knob to restrict unpriv allocations")
> Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
> ---
> v2:
> * Drop other 3 patches (No change for this patch)
>
> v1: https://lore.kernel.org/bpf/20220818042339.82992-1-kuniyu@amazon.com/
> ---
> kernel/bpf/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
> index c1e10d088dbb..3d9eb3ae334c 100644
> --- a/kernel/bpf/core.c
> +++ b/kernel/bpf/core.c
> @@ -971,7 +971,7 @@ pure_initcall(bpf_jit_charge_init);
>
> int bpf_jit_charge_modmem(u32 size)
> {
> - if (atomic_long_add_return(size, &bpf_jit_current) > bpf_jit_limit) {
> + if (atomic_long_add_return(size, &bpf_jit_current) > READ_ONCE(bpf_jit_limit)) {
> if (!bpf_capable()) {
> atomic_long_sub(size, &bpf_jit_current);
> return -EPERM;
>
next prev parent reply other threads:[~2022-08-23 21:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-23 18:12 [PATCH v2 bpf] bpf: Fix a data-race around bpf_jit_limit Kuniyuki Iwashima
2022-08-23 21:20 ` Daniel Borkmann [this message]
2022-08-23 21:51 ` Kuniyuki Iwashima
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=311e4686-a514-b210-080b-849d8d0ad5d3@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=kuni1840@gmail.com \
--cc=kuniyu@amazon.com \
--cc=netdev@vger.kernel.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