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=1794074389; b=b2EOE6M08mgHIqIvhjin5IlbmEvHD/Ckk6dstH14bUPBr64gzFKf1Hg3t7oICIvvcAFf aw6e5PpS6mVPHCwZtPGPgKv5/jQvd29gaInISRJY+Up7F86VjEf5MEBDMA9WVrDkfJ4kH F7/X3Ks2mQ1GjIjca3oShD4znOwBqt0SVoW58cq4jZ3Tqv03GXnkLlXftyrYXU/zUoIe6 j0UXlJVi8giSePEIdSCTizqc9q3EGIAuYOqy9U23T1tYekXWdkiDvOxRxcusvacaf50mp cM+nM0o4J8y3y1F+gytj7eCB2BQnPRGzRV2xTgJqr7o0m9BAkoAtInwLH+RPbzqwXyg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794074389; h=DMARC-Filter:Received:DKIM-Signature:Received:Received:From:Subject: Date:Message-Id:MIME-Version:Content-Type:Content-Transfer-Encoding: X-B4-Tracking:X-Change-ID:To:Cc:X-Mailer; bh=8lVLvxc8Qs6BngpHaRFwnA/hdSpn+KLdbrSSp8PidEc=; b=I9hsqleBrnSYNqRjD/7+2jVFsFnPmGEMhSl1S2G+LwCdXCVGO4GV0yQsSqdDy+AZp4/T Bl5nbDtozEMiGOh1pWdmBrz015XFR1XGoNwASLa/tm08lBeVWv0VuU01dApa8i0pegt7N v+N4ZFgA2bJ+yPvsnKPkMnpLAyyOcVR3S/OZhoRdFsvzqBSCn/JYbpj7jd8wlme1FZG9m iGBzXicGgOrxKZxXrbYvB4+FzSEAQ4Tf7Id5rniyVydJAO0nVWWUk6DfXq0P0t7gfNHpx nHZoKcH4Uk4xdzNgPK4DwmD+a4ZaW3JWGOphrPlf9SdXH4O95rBLwdcLfdoTDqkSsgQ== 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=inpLAybU; 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 EBFEB606A339; Sat, 7 Nov 2026 17:59:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org EBFEB606A339 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=inpLAybU Received: from mailtransmit03.runbox ([10.9.9.163] 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 1xPkhN-007oU0-2t; Sat, 07 Nov 2026 18:59:29 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rbox.co; s=selector1; h=Cc:To:Content-Transfer-Encoding:Content-Type:MIME-Version: Message-Id:Date:Subject:From; bh=8lVLvxc8Qs6BngpHaRFwnA/hdSpn+KLdbrSSp8PidEc= ; b=inpLAybUUeGEXVpxpjf2xkIg/S8TV16mUpOyCBS1FjTk0Ae7d+3SYOqHNxhi+qwcnSEhXie8N Wm7dOcChwdhYCegGVfc4ML8ZKqz6RbnBcbiAV6766WYadGmRHP2lNRIMvcKnWE6lMoDO44kNav1OI BMOjNr/W/Ic2AmYZQLyIC7y8y59GNoi0ER+BkM/FYRsmdP2fjaJRaxtzEvoCVq41R3b/gT8BnMG9I nAqMJ+ZpxhT7nENW2OGq+Ks/qzWeZGDZIEaajt8rJY9eDtWNPir4U5vs73VyNLtq2HpE9lEMAeMWn j6bayALldb+08aGxMLa859NJWFnpFpSc1ZwBsw==; Received: from [10.9.9.74] (helo=submission03.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1xPkhB-0006ai-A7; Sat, 07 Nov 2026 18:59:17 +0100 Received: by submission03.runbox with esmtpsa [Authenticated ID (604044)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.95) id 1xPkgy-007LnK-Th; Sat, 07 Nov 2026 18:59:05 +0100 From: Michal Luczaj Subject: [PATCH bpf-next v3 0/8] bpf, sockmap: Restrict iter-context sockmap updates to sockmap iterators Date: Sat, 07 Nov 2026 18:58:22 +0100 Message-Id: <20261107-sockmap-update-limit-iter-v3-0-7c0bad1ad036@rbox.co> 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 X-B4-Tracking: v=1; b=H4sIAAAAAAAC/32Oyw6CMBBFf8V07Zg+pFhX/odx0ZZBRoWSthCM4 d9FXLhzeXPnnjMvljASJnbcvFjEkRKFbglqu2G+sd0VgaolM8mlFpwfIAV/b20PQ1/ZjPCgljJ QxggVV2hlUZuyLNiy7yPWNK3sM3N9DR1OmV2+TRrcDX3+oD+3DaUc4nN9YxTr4msU+o9xFMBBq tqava5cYfAUXZh2PqyWUf44gst/HLlw0Girld8rp8yPM8/zG0I5NR0kAQAA X-Change-ID: 20261008-sockmap-update-limit-iter-d03ea25f9775 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 , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , Jakub Sitnicki , Jiayuan Chen , "David S. Miller" , Jakub Kicinski , Simon Horman , Jonathan Corbet , Shuah Khan , Randy Dunlap , Stanislav Fomichev Cc: Michal Luczaj , bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-doc@vger.kernel.org, Sashiko X-Mailer: b4 0.15.2 Follow-up to Sashiko's report [1] and the decision to restrict which iterator may perform sockmap updates [2]. Series started short: remove about-to-be-stale test, restrict updates, add a negative test. Then it expanded: mark bpf_iter__sockmap::sk as PTR_TRUSTED, restrict bpf_sock_destroy() callers to iter/{tcp,udp}, few little tweaks. [1]: https://msgid.link/20260626205814.BAC3C1F000E9@smtp.kernel.org [2]: https://msgid.link/87echn2fhd.fsf@cloudflare.com Signed-off-by: Michal Luczaj --- Changes in v3: - Drop RFC prefix - Update bpf_iter_reg::feature docs - Fix tcp_request_sock BTF build error - Restrict allowed callers of bpf_sock_destroy() to iter/{tcp,udp} (Alexei) - Link to v2: https://patch.msgid.link/20261102-sockmap-update-limit-iter-v2-0-e96a63c43b39@rbox.co Changes in v2: - Commit 7cc639dc45c5 ("bpf: Don't take an extension for an iterator program") and commit b83bacf2161d ("bpf: Don't take a program with a target program for an iterator") landed. Drop the redundant env->prog->type check. - Mark bpf_iter__sockmap::sk as PTR_TRUSTED (Alexei) - Link to v1: https://patch.msgid.link/20261016-sockmap-update-limit-iter-v1-0-23fa946db59e@rbox.co To: Alexei Starovoitov To: Daniel Borkmann To: Andrii Nakryiko To: Eduard Zingerman To: Kumar Kartikeya Dwivedi To: Martin KaFai Lau To: Song Liu To: Yonghong Song To: Jiri Olsa To: Emil Tsalapatis To: Ihor Solodrai To: Shuah Khan To: John Fastabend To: Eric Dumazet To: Kuniyuki Iwashima To: Paolo Abeni To: Willem de Bruijn To: Jakub Sitnicki To: Jiayuan Chen To: "David S. Miller" To: Jakub Kicinski To: Simon Horman To: Jonathan Corbet To: Shuah Khan To: Randy Dunlap To: Stanislav Fomichev Cc: bpf@vger.kernel.org Cc: linux-kselftest@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org Cc: linux-doc@vger.kernel.org --- Michal Luczaj (8): selftests/bpf: Remove sockmap update from bpf_iter_unix bpf, sockmap: Restrict iter-context sockmap updates to iter/sockmap selftests/bpf: Add negative test for sockmap update from non-sockmap iter bpf, docs: Document BPF_ITER_NOSLEEP bpf: Restrict bpf_sock_destroy() to iter/{tcp,udp} bpf: Mark bpf_iter__sockmap::sk as PTR_TRUSTED selftests/bpf: Add iter/sockmap bpf_sock_destroy() negative test bpf: Fix "unresolved symbol tcp_request_sock" build error Documentation/bpf/bpf_iterators.rst | 12 +++++++++--- kernel/bpf/verifier.c | 4 +++- net/core/filter.c | 15 ++++++++++++++- net/core/sock_map.c | 2 +- tools/testing/selftests/bpf/progs/bpf_iter_unix.c | 10 ---------- .../testing/selftests/bpf/progs/sock_destroy_prog_fail.c | 11 +++++++++++ .../testing/selftests/bpf/progs/verifier_sockmap_mutate.c | 14 ++++++++++++++ 7 files changed, 52 insertions(+), 16 deletions(-) --- base-commit: 2d0b457611c06304138754a05e0873cc18acfb7e change-id: 20261008-sockmap-update-limit-iter-d03ea25f9775 Best regards, -- Michal Luczaj