From nobody Mon Nov 13 10:24:41 2023 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 4STQXT5zj0z5115q; Mon, 13 Nov 2023 10:24:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4STQXT5VlVz4FhH; Mon, 13 Nov 2023 10:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699871081; 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=bbn533hVMSEW5E1Wad2w+VeM6CIzE8SASgzD4YbQVzY=; b=qpEAW8z1RF04w3Lf3q3+iez8i0ivGd9nJa8e1eng/HysbVyoJ1atJv/XOQi/eCmeEqKJ/Y 5QtZVvDbNTR/d4WrhEnDWwHeMy54PnYYu6WGR8K4gYXvwuwf5Pmp4CEPKodLESh8fdtToP 7Lc4Nfg/8ytEffpG3HvvybAYlm4o6pk0uzFmr5zntvcax12Z21ot71O2WaDLjf5uaRA65d FXqyplzNACgau38G/mJ4m7TBTbVXVUh8P46+K6DCW1W2UlNMtSB3CIlgM8X11k6amZeMYy 3PPDdObdMAZ+46Frk/ov44rh7pR/0lw5Nk6G7Kb5ORkoBInWKxk59cOrAUqEfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699871081; 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=bbn533hVMSEW5E1Wad2w+VeM6CIzE8SASgzD4YbQVzY=; b=fHCrxuA3SW8s4C9unbrzlIpuGaYkdNfX2B+m2lb2ZtVhScUSg2nBWb2Uv8Zugnk5JPi7g8 LKmZvWLdCQ+vs89v2nRXlse923UG7Wd/DtLSo3yXLRVIk7+E0G32rNfm5Ndn+KXxxPKJVg gdNnXNozd1PwbDoyKTQzQhEN/RQFIIYrPPTFdWVhtl0FrhL4CTmgnHD0hLI4stHn6X7fwN HqIv4TVtlfOK3vNO8CsyR5OL+XsvD2K4H02wkuhv5QEUn+zGANNxY0ey485AdoqZsgJpdd u2dFTPWHrzkMHRikvJFaXA8PpTnw75U6yfbDsQfVFExzg5W8JsYyHqyk82ii7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699871081; a=rsa-sha256; cv=none; b=mClMblPMINQLjlCNT9GM+O/ykDYFMJMwpkI/p70caaNpCLBBYV9x70mQDDwtMbvLuD8Iig cDMLtOvIHCXrl35LwrLCrRQip5eEiG2uQYTFDQjOs6fu1y3/l9fliPpjW08+zs2YIiNXFY bovqlnu5P9FjQ7XON17uw6/jX+Bm1JHcNgE0sG3sc8TSYygHstP+u8efCUgJWRDZZjyWFA UD+DWwVtnUe+CDSGdtoOvMhRD3qRGZkdKnx81dxqAU3pCMMdM5KBAcdiwpLPRFIN0L7Zhb OpF4APbCRghWt+s1RGF0vl0keX7QFQFH+mNdFHqJnLVZC7Evjr5/qm6UCkA+hQ== 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 4STQXT4Z5yz11w5; Mon, 13 Nov 2023 10:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ADAOfct060328; Mon, 13 Nov 2023 10:24:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ADAOfQw060325; Mon, 13 Nov 2023 10:24:41 GMT (envelope-from git) Date: Mon, 13 Nov 2023 10:24:41 GMT Message-Id: <202311131024.3ADAOfQw060325@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: 281f61d211b3 - stable/12 - bpf: Make dead_bpf_if const 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/12 X-Git-Reftype: branch X-Git-Commit: 281f61d211b38d95986d2cec97407e770313a087 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=281f61d211b38d95986d2cec97407e770313a087 commit 281f61d211b38d95986d2cec97407e770313a087 Author: Zhenlei Huang AuthorDate: 2023-10-21 04:52:27 +0000 Commit: Zhenlei Huang CommitDate: 2023-11-13 10:22:41 +0000 bpf: Make dead_bpf_if const The dead_bpf_if is not subjected to be written. Make it const so that on destructive writing to it the kernel will panic instead of silent memory corruption. No functional change intended. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42189 (cherry picked from commit 7a974a649848e1222a49d0d49726d06bd5c1dbd9) (cherry picked from commit 5d031613affa14b3de64f8cf9fed15604fb826d3) (cherry picked from commit 1e147980497b38d65cd72162c000c88507a7fa76) --- sys/net/bpf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 5ca92a97f74f..47e41f3886cb 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -99,7 +99,7 @@ __FBSDID("$FreeBSD$"); MALLOC_DEFINE(M_BPF, "BPF", "BPF data"); -static struct bpf_if_ext dead_bpf_if = { +static const struct bpf_if_ext dead_bpf_if = { .bif_dlist = LIST_HEAD_INITIALIZER() }; @@ -2693,7 +2693,7 @@ bpfdetach(struct ifnet *ifp) */ BPFIF_WLOCK(bp); bp->bif_flags |= BPFIF_FLAG_DYING; - *bp->bif_bpf = (struct bpf_if *)&dead_bpf_if; + *bp->bif_bpf = __DECONST(struct bpf_if *, &dead_bpf_if); BPFIF_WUNLOCK(bp); CTR4(KTR_NET, "%s: sheduling free for encap %d (%p) for if %p", @@ -3046,7 +3046,7 @@ void bpfattach2(struct ifnet *ifp, u_int dlt, u_int hdrlen, struct bpf_if **driverp) { - *driverp = (struct bpf_if *)&dead_bpf_if; + *driverp = __DECONST(struct bpf_if *, &dead_bpf_if); } void