BPF List
 help / color / mirror / Atom feed
From: Kuniyuki Iwashima <kuniyu@amazon.com>
To: Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Andrii Nakryiko <andrii@kernel.org>
Cc: Kuniyuki Iwashima <kuniyu@amazon.com>,
	Kuniyuki Iwashima <kuni1840@gmail.com>, <bpf@vger.kernel.org>,
	<netdev@vger.kernel.org>
Subject: [PATCH v1 bpf 4/4] bpf: Fix a data-race around bpf_jit_limit.
Date: Wed, 17 Aug 2022 21:23:39 -0700	[thread overview]
Message-ID: <20220818042339.82992-5-kuniyu@amazon.com> (raw)
In-Reply-To: <20220818042339.82992-1-kuniyu@amazon.com>

While reading bpf_jit_limit, it can be changed concurrently.
Thus, we need to add READ_ONCE() to its reader.

Fixes: ede95a63b5e8 ("bpf: add bpf_jit_limit knob to restrict unpriv allocations")
Signed-off-by: Kuniyuki Iwashima <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;
-- 
2.30.2


  parent reply	other threads:[~2022-08-18  4:25 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-18  4:23 [PATCH v1 bpf 0/4] bpf: sysctl: Fix data-races around net.core.bpf_XXX Kuniyuki Iwashima
2022-08-18  4:23 ` [PATCH v1 bpf 1/4] bpf: Fix data-races around bpf_jit_enable Kuniyuki Iwashima
2022-08-18 22:49   ` Alexei Starovoitov
2022-08-19  0:06     ` Kuniyuki Iwashima
2022-08-19  0:13       ` Alexei Starovoitov
2022-08-19  0:55         ` Kuniyuki Iwashima
2022-08-19  1:05           ` Alexei Starovoitov
2022-08-19  1:15             ` Kuniyuki Iwashima
2022-08-19  3:27               ` Alexei Starovoitov
2022-08-19  3:46                 ` Kuniyuki Iwashima
2022-08-19 22:56                   ` Alexei Starovoitov
2022-08-18  4:23 ` [PATCH v1 bpf 2/4] bpf: Fix data-races around bpf_jit_harden Kuniyuki Iwashima
2022-08-18  4:23 ` [PATCH v1 bpf 3/4] bpf: Fix data-races around bpf_jit_kallsyms Kuniyuki Iwashima
2022-08-18  4:23 ` Kuniyuki Iwashima [this message]
2022-08-24  1:10 ` [PATCH v1 bpf 0/4] bpf: sysctl: Fix data-races around net.core.bpf_XXX dongdwdw

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=20220818042339.82992-5-kuniyu@amazon.com \
    --to=kuniyu@amazon.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=kuni1840@gmail.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