From nobody Sun Aug 06 20:36:25 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 4RJrp25Ltqz4mNRt; Sun, 6 Aug 2023 20:36:26 +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 4RJrp21Bcbz4bfc; Sun, 6 Aug 2023 20:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354186; 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=15x0A83o1ZhYzW2rDneKZj8PaT0knF0GidfEZ7kcSeg=; b=aV/iBSKIZUda6FjxTlOlix3hUiuD+PEv3MXKx+z0SzwtXbazjqMBT2QqVCTPzKKEWhb4xn BEGWW6zwBpKrKpVTymrAAqG/hExdjkUqpFG3T1ghLtReFp6SRnDcqm5keIGBtw1WU3Xid6 uzKRo5IMjLZP93c0JfCNmYXa5qjUghhBbYvM+qZZR391v6mf2guTWfO/L6tqTUAE7jr4Vw exPtDnA1oe7nMaKhGI89R6o48RVDFwuT7l0Y8p0tyByrMZeqiqeUVzzEaqQnRFLlh9fUb9 5GQk6RcECzjcB8nO39CheNWVEIwSbv+sAvKrAp5FSJyMa7rOMz8Y4sOtR0CoJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354186; 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=15x0A83o1ZhYzW2rDneKZj8PaT0knF0GidfEZ7kcSeg=; b=x+nM+d0CJn4jM4Ifnm576otbT4tY6ZW/To2Yv0N83ODMM7xre9s8uUYmi+l7tOhXjoTuvF BGDXjJs51K4fjdIAYBpt9jJLvyYhToKQbKnvSqzzma119SFHv8kRlkFHpxpNTwpFi7lDby t+vE2CeEuZv9y4dnWCEShNhDbXg0eDRNoVfW1zfn2khyD5GUX0kkYHRx7vygIVrcY05kaC L5KeZ3rticRGc6Wjqze4FocCiFlruVhra3DWEQ43SXtpoXeA4VBtK7LHEWfBiXtuVf3YwK JAgFo7MNdQj8xY1HIFtyVJvT6UYZTakSnOkcogT6sRzmuHgBxjXAsyxqrNM7vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354186; a=rsa-sha256; cv=none; b=l+/DLNFnLRUi1l5KXlpxTjMaT4xu5srcdPIdNgkGsSUsft67k0wdVWz/c3Mgm/obuSADBm dWfKYwcpplGY4w8TEuKK6SJ7ajboe0MrC8g2m4Sd+j1DJ1BfwI9LwbyV4dau7c0dtFNfyQ sJ69L9sC8f9wqMdF+RzYVm+Ek4JKzyYdOQbJtwpX8XdHMYOanGbQs88VeH/Kaoc5vk2+vw m4Z9tz9uraMK72kyiR5UBGMn23bO7QbLTAzmef4drLlUmfP95HVt9qK/mdfCYWOcnXAE+T 2kD+BIL5MjdjjbzIO+MGRMwwUaBclfWWfgZ54jIeUf9Xt+LMYfXpqalkrujbLg== 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 4RJrp20Hl9z8mX; Sun, 6 Aug 2023 20:36:26 +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 376KaPIb042653; Sun, 6 Aug 2023 20:36:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaPB0042652; Sun, 6 Aug 2023 20:36:25 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:25 GMT Message-Id: <202308062036.376KaPB0042652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: b59b3443f39d - stable/13 - gif(4): Assert that gif_output() isn't called for EtherIP 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: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b59b3443f39d2b7d6c631094fde7723e0aec1319 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=b59b3443f39d2b7d6c631094fde7723e0aec1319 commit b59b3443f39d2b7d6c631094fde7723e0aec1319 Author: Marius Strobl AuthorDate: 2023-07-23 16:58:42 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:17:30 +0000 gif(4): Assert that gif_output() isn't called for EtherIP With the current implementation of if_bridge(4), bridge_enqueue() calls gif_transmit() only. Ensure it stays that way so that the expectations in both drivers are either met or changed accordingly. PR: 227450 (cherry picked from commit 8a0308722372a3ac6a94967ae4fe3123842309e2) --- sys/net/if_gif.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 4d2c1dcf091d..343c1cd070ad 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -406,6 +406,9 @@ gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, { uint32_t af; + KASSERT(ifp->if_bridge == NULL, + ("%s: unexpectedly called with bridge attached", __func__)); + if (dst->sa_family == AF_UNSPEC) memcpy(&af, dst->sa_data, sizeof(af)); else