From nobody Wed Jul 26 11:28:59 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 4R9s9g4CKvz4pKtG; Wed, 26 Jul 2023 11:29:00 +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 4R9s9R3dT2z4LHw; Wed, 26 Jul 2023 11:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690370939; 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=I8GogbLKnL+eyQg0RHwKJki6SPIx/urkVauCopez4f0=; b=eqjSqfJgtuoIGUh6F1iDn3Yk40/wRrVC8Fxd2ugLrNyCKiuvS51lhX9mWfpTEIix3d7MwY q5k466HqFfzISTC/WbaD0I6DDftQhI+eRvgywpiWG8gbL8+3p2GWAeU1XGQZ/r7jD6jQYP XdpY525/l+3y3JYLyz8zXyXBlwLzE5mG1mFf2qg6V+YFRrCskV1vPAOd6P1Pq+1fjzKp+K j4usUjrHdhAA9J6Q+TeYxLMIC1tsW4wDbImFfcw87Rfr5Bb/pTUSZkDQaKZmA33oET2nMu LD5VUWnXjfFW2v8fdfoZQmR3TZE6DZO5nEV/RtDzgjJaHjLuTkyqkrjfiaJ8Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690370939; 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=I8GogbLKnL+eyQg0RHwKJki6SPIx/urkVauCopez4f0=; b=L2F46r+fp/75WeWTnYjFbdDXWpBog4PGb5UQu8bVKfHVXddTKXvrnQQ+idUytwtOrR7zcJ p0ZFxwECcKD4UjUOB6F5NoJ0P6qMKhGib1kXx6EzAkRLlk1dKcAGDNs1e8XtZaQbN+Lsy2 4Y6VU7yljKUt+tg9SW1BPNjvSajaywcsB3tbVeHJqXDt1atLnuqwHXEMfVHouqurW3Fi2R 8UgLy3yiqekL4QBxcW9zESrH5iixkYA4MXFxjbXGa5udzR71cI8edSkHNJ6wfI2PSj4w9A zx7NIjDBJZU4YvQj/1xCPr6h40PoZL0n8qo6nn9O9lHENvIc3AmlKHy1krdmFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690370939; a=rsa-sha256; cv=none; b=dgQxWVRD6Ildmghxa+avdgZ8mGBlguNWOLhUbfSg8fFeQ4aQgJeg//qzI7jm4fWZ76OGUK /H7s/apkSiu4/ZOYo6+2YvnFbM3GSKEDjGlrrALqo5b5skL2EtGml3d2gm+wErLpXAxUiy DURQ3UI5/9jOOXjAnU9oa9p0RdtX+c8bbWU4ShdGQaHci97gKC3TXynwCkrgwmOWSPHOSQ Q8iSsu4IAsA4s7a9d5yS7TKFZknQM7SVtZYvQeV7cTkXJ6cAlfoahZsDS5GdGMXk1Xk7SV FjtrilQJ48SUfEw11gJ0ebXdi/Fdh8B5xrFNbzhNPJKCtwKchYZ8lAfOka4Ybg== 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 4R9s9R2K0Czgs9; Wed, 26 Jul 2023 11:28:59 +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 36QBSxsc024140; Wed, 26 Jul 2023 11:28:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QBSx51024139; Wed, 26 Jul 2023 11:28:59 GMT (envelope-from git) Date: Wed, 26 Jul 2023 11:28:59 GMT Message-Id: <202307261128.36QBSx51024139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 8a0308722372 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8a0308722372a3ac6a94967ae4fe3123842309e2 Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=8a0308722372a3ac6a94967ae4fe3123842309e2 commit 8a0308722372a3ac6a94967ae4fe3123842309e2 Author: Marius Strobl AuthorDate: 2023-07-23 16:58:42 +0000 Commit: Marius Strobl CommitDate: 2023-07-26 11:14:22 +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 --- 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 5fa7664780c1..a4ac7243dbf7 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -407,6 +407,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