From nobody Thu Feb 06 19:18:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ypn274TQlz5mvtL; Thu, 06 Feb 2025 19:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ypn272ZDyz43TV; Thu, 06 Feb 2025 19:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738869503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ol//UpiuQY6Z1u6amOP+j50jJHBaEudbJnr5f0JolMU=; b=v0FOyVk4jM9bt9apIag6OKmOqZYvXe4AcbmWlLj6R8gcSqD1LheN3pkupru6rTZQFbGqDK RFlX/GLvs1F0EpSIMFX5l5cr809XEAMIxab+MfnHZTEVMmHlnxTuukH0dkhte4u2cnP8uw Zujj6fIPiZlIsIBImvMP01wdTPj45l/0+bXjH/SAuXptjbVZoZl06GWY4s8uBfcTqjrAsG kkmjTaz/26CwMuI7EMCCjZu2bg7Gjqh2H3Wd3DusdWPRkG4drzu9n+0j2C/RhJDyApbj/y +wbpaGiWqbFClX5uYBp+TUxpZ4ILng6DhXQjKAWqB3pQGqaVI0DvJbZH/0gcLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738869503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ol//UpiuQY6Z1u6amOP+j50jJHBaEudbJnr5f0JolMU=; b=m19m4qu2WVdXwqfBsDTaGQtqyBfAIRK7dds6U7XFU7e3HZQthCWt4BlKv74ij/rSWr/nfx lNSBIJ+WLVP88u31Jj4UxO8hpT2UQtVjYSpVmOtaNgjuwNQLRCffI1bQLbuOvffyUOQ+RV 8gYVaG9uM35VH9k9Qx1XnxxwlmsJdX6yP3VfrVv0w42YcJI9IZT2SU/IMZwRCzqcacwiq3 eMCpEhGGCYeXKSQ+OgdPPacTDROxo/Kezr/gANJrAPLl+vfj8m6JduCmjyV3lqeI9rM6Vx pGEqqyWBrDd9YwzlmDAPH5hzvX9wbgCmo3aUz/g1DE69w6MYl+8UzrkfNG79uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738869503; a=rsa-sha256; cv=none; b=lkD+/RSz7c9DWKMuD8t1bzcEx7HClS09PPmO95Wy58NYgXJBGPeVlPnE9jBnULWmux+L1u uq4/8XwfH4eHNhgCYXUgfeJhdam8A5x3e8o65nC+Qlyu1vNqu0dMeqak8CH3p2cIWcLrg3 etrkQcycC5jm4pRkdN/sYUQTZQI7lvA+jlU3vV9fimI+VhTknC8WpY7p8I7LAHvl+cIEBU FvYeF6HRPN+cYtqeKD0j0nnY3R26AWJuY6/MiQN9yer2DdQ6snuroi9fxA9KO7eInJi+kV 12sJBw2QPUAeEg2bKbA+x4hclh8tBhm8ilCIBnqf62kGuNlSuj/O16o+KpbZug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ypn271yZVzrPM; Thu, 06 Feb 2025 19:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 516JINE1015616; Thu, 6 Feb 2025 19:18:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516JINdO015613; Thu, 6 Feb 2025 19:18:23 GMT (envelope-from git) Date: Thu, 6 Feb 2025 19:18:23 GMT Message-Id: <202502061918.516JINdO015613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 6b81815307b0 - stable/13 - ifnet: Detach BPF descriptors on interface vmove event List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b81815307b00d37b81f71d68a51f67c72a2edb0 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6b81815307b00d37b81f71d68a51f67c72a2edb0 commit 6b81815307b00d37b81f71d68a51f67c72a2edb0 Author: Zhenlei Huang AuthorDate: 2025-02-04 15:04:59 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-06 19:06:42 +0000 ifnet: Detach BPF descriptors on interface vmove event When an interface is moving to/from a vnet jail, it may still have BPF descriptors attached. The userland (e.g. tcpdump) does not get noticed that the interface is departing and still opens BPF descriptors thus may result in leaking sensitive traffic (e.g. an interface is moved back to parent jail but a user is still sniffing traffic over it in the child jail). Detach BPF descriptors so that the userland will be signaled. Reviewed by: ae MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D45727 (cherry picked from commit 1ed9b381d4701fc9f66741256e93b96e22273217) ifnet: Fix build without BPF The newly introduced function bpf_ifdetach() is only available when device bpf is enabled. Fixes: 1ed9b381d470 ifnet: Detach BPF descriptors on interface vmove event (cherry picked from commit d8413a1c3ba235a79ae6b8cc35767a861855c7e2) (cherry picked from commit 2e4eaf3c13d2b5aa76f9759e51e35faf29d56993) --- sys/net/bpf.c | 27 +++++++++++++++++++++++++++ sys/net/bpf.h | 1 + sys/net/if.c | 7 +++++++ 3 files changed, 35 insertions(+) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 70232ffd75bd..b720c70bdbfa 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -2789,6 +2789,33 @@ bpf_get_bp_params(struct bpf_if *bp, u_int *bif_dlt, u_int *bif_hdrlen) return (0); } + +/* + * Detach descriptors on interface's vmove event. + */ +void +bpf_ifdetach(struct ifnet *ifp) +{ + struct bpf_if *bp; + struct bpf_d *d; + + BPF_LOCK(); + CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) { + if (bp->bif_ifp != ifp) + continue; + + /* Detach common descriptors */ + while ((d = CK_LIST_FIRST(&bp->bif_dlist)) != NULL) { + bpf_detachd_locked(d, true); + } + + /* Detach writer-only descriptors */ + while ((d = CK_LIST_FIRST(&bp->bif_wlist)) != NULL) { + bpf_detachd_locked(d, true); + } + } + BPF_UNLOCK(); +} #endif /* diff --git a/sys/net/bpf.h b/sys/net/bpf.h index d6213ebd10f4..2fe4c87cc534 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -426,6 +426,7 @@ void bpfattach2(struct ifnet *, u_int, u_int, struct bpf_if **); void bpfdetach(struct ifnet *); #ifdef VIMAGE int bpf_get_bp_params(struct bpf_if *, u_int *, u_int *); +void bpf_ifdetach(struct ifnet *); #endif void bpfilterattach(int); diff --git a/sys/net/if.c b/sys/net/if.c index e30e1c7e5dca..46ebabe09a51 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1287,6 +1287,13 @@ if_vmove(struct ifnet *ifp, struct vnet *new_vnet) { void *old; +#ifdef DEV_BPF + /* + * Detach BPF file descriptors from its interface. + */ + bpf_ifdetach(ifp); +#endif + /* * Detach from current vnet, but preserve LLADDR info, do not * mark as dead etc. so that the ifnet can be reattached later.