From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=185.226.149.38 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793582299; b=2+BxkvsPjHKIJS5C2IC0ZRZhOTa+Brsa8F8DJjgfi8nS5YhS6npxnb7WnTU5O6/sM7T2 pjYgG7IWOc9yUY/aIJrO8YvFO3uvPWlslB+XvctU5ch247r24LvBbSne1acHbxaM3Bw21 gTULJRrIZJJpJyHI8fKqVqPMMyFaxDaI1O+XMrOjDWOB7TLmr2fpRSlrAHXx+KttV9Yxm 5tWS4L93oT/o3hB+JLxaUG9EGlY6EVwCiZ1YXfuUfWhThCHZ11hhmNhfgx/UnPoNtV8Tj wBZiJLSg5Nar7wfHpSXJbyw5IznESN6xcZsKjlLNyLqUg+SeFn6NrRcp60fFYXhNwIQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793582299; h=DMARC-Filter:Received:DKIM-Signature:Received:Received:From:Date: Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer; bh=8tIm04Oja/SW4T8u6sczsnBdJ7I+/QcEMyTu0oj4EaQ=; b=HhfNVhsG3PHaUtZjZYryWQYTj0MldJFK1LgD8juK004ha+2aPneNmFGJFvfNWPzu3+EJ /kQV6pxBTdi1jjOEANEWCPjNPMkNHzzrxAvcKAMAVF1zoLCl+QesDdWTNWAPp266m5bT/ ftczOe5EBG11HrftgaU2mNvZ3QF+6qq4CCoEN08XTCugL1JYXZmIu9Y8IuJmo1bGuqMte 4/mVuQx9+pHfzL5zEFkiZ7g0yNQBVElU1lwKKrMTNsC7bBmPaekR7xhxUBECqF3BkmK+a fqT9zhAbCdNWu4yO+vtSIpblhbfzH2p8xG8IPldBaRZMmRf1Hezdq032e+lxL4GH6SA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=rbox.co; spf=pass smtp.mailfrom=rbox.co; dkim=pass header.d=rbox.co header.i=@rbox.co header.a=rsa-sha256 header.s=selector1 header.b=SMdZ9D9x; arc=none smtp.remote-ip=185.226.149.38 Received: from mailtransmit05.runbox.com (mailtransmit05.runbox.com [185.226.149.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B02C9606A32C; Mon, 2 Nov 2026 01:18:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org B02C9606A32C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rbox.co Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=rbox.co header.i=@rbox.co header.a=rsa-sha256 header.s=selector1 header.b=SMdZ9D9x Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1xNggX-00AGXc-6s; Mon, 02 Nov 2026 02:18:05 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rbox.co; s=selector1; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From; bh=8tIm04Oja/SW4T8u6sczsnBdJ7I+/QcEMyTu0oj4EaQ=; b=SMdZ9D9xVKQXZPhSoZ6UThEiwR FJY2FadAoyT3s3OfVkbW1bRfZw7FQnWVRs8muTJkeMl1iy8AyCJvCTQSrCaW6mKHwNa2TjaSuaRIn y6kifW7E+iweoHXJsMBPFS0nRp+xESj7P9OjvszqltwpmchHOuAdSybYDO8P06H/zPgy3lRWWrVgr Ufh0mAXQR+e9tLHP31SkLRZhLLApNSQFFHX7wkSG72TThhL452dNHnQCT3qfG+U5CEI2prKyC0HKB Zre7fSOF9GDf04NozlwgR0JiBIvV2LyiC6IP6LFmczy8Si+ae3FZaVpiX+q7sNoPfyBOim4jK9T10 IbpqsDqA==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1xNggR-0005sB-H8; Mon, 02 Nov 2026 02:17:59 +0100 Received: by submission01.runbox with esmtpsa [Authenticated ID (604044)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.95) id 1xNggK-008JiF-9p; Mon, 02 Nov 2026 02:17:52 +0100 From: Michal Luczaj Date: Mon, 02 Nov 2026 02:15:59 +0100 Subject: [PATCH RFC v2 2/4] bpf, sockmap: Restrict iter-context sockmap updates to iter/sockmap X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261102-sockmap-update-limit-iter-v2-2-e96a63c43b39@rbox.co> References: <20261102-sockmap-update-limit-iter-v2-0-e96a63c43b39@rbox.co> In-Reply-To: <20261102-sockmap-update-limit-iter-v2-0-e96a63c43b39@rbox.co> To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Ihor Solodrai , Shuah Khan , John Fastabend , Lorenz Bauer , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , Jakub Sitnicki , Jiayuan Chen , "David S. Miller" , Jakub Kicinski , Simon Horman Cc: bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Luczaj , netdev@vger.kernel.org, Sashiko X-Mailer: b4 0.15.2 Among tracing progs, allow only iter/sockmap to update sockmaps and sockhashes. Previously, any BPF_TRACE_ITER program could perform these updates, which caused locking issues in specific scenarios [1][2][3]. This tightening is part of the broader effort to lock down the BPF API [4]. [1]: commit 4d328dd69538 ("bpf, sockmap: Fix af_unix iter deadlock") [2]: commit 64c2f93fc325 ("bpf, sockmap: Take state lock for af_unix iter") [3]: https://msgid.link/87echn2fhd.fsf@cloudflare.com [4]: https://msgid.link/akRZ_e7DJh2aP-2i@john-p8 Reported-by: Sashiko Closes: https://msgid.link/20260626205814.BAC3C1F000E9@smtp.kernel.org Suggested-by: Jakub Sitnicki Signed-off-by: Michal Luczaj --- kernel/bpf/verifier.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 1b6c0674ff6a..4dadfe9505a2 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -10487,6 +10487,7 @@ static bool may_update_sockmap(struct bpf_verifier_env *env, int func_id) { enum bpf_attach_type eatype = env->prog->expected_attach_type; enum bpf_prog_type type = resolve_prog_type(env->prog); + const char *afname = env->prog->aux->attach_func_name; if (func_id != BPF_FUNC_map_update_elem && func_id != BPF_FUNC_map_delete_elem) @@ -10497,7 +10498,8 @@ static bool may_update_sockmap(struct bpf_verifier_env *env, int func_id) */ switch (type) { case BPF_PROG_TYPE_TRACING: - if (eatype == BPF_TRACE_ITER) + if (eatype == BPF_TRACE_ITER && + !strcmp(afname + strlen(BPF_ITER_FUNC_PREFIX), "sockmap")) return true; break; case BPF_PROG_TYPE_SOCK_OPS: -- 2.56.0