From nobody Sat Aug 23 00:59:10 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 4c7zGR09j7z65V7m; Sat, 23 Aug 2025 00:59:11 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7zGQ6bdQz3hVN; Sat, 23 Aug 2025 00:59:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755910751; 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=7h9st3jxUcGiWgUZBd6eTZ7DffOzM7vJfCNkNMBTNUY=; b=cFQGte4Oe/OoDAXRzbyGUe1nbm63PWZygh3KzxvQXw9nPMZKzJJqFwLOFxF/e4WBWZYqSh rPqqzdznvtWKspQD7hc2ZyGmC0xwSCXAi/jtGNZNi5R6diWw6km3l1JEBDNyhCU9KW8f/Y 0aUMLSyoRLxKE7lSRVDSyvIBJyPTg2DPweJcoWgdcI0KJC2ifjLQ/0RGuygTw76E9lEo5/ lmTPy+YT8qDfcTr5nUTeVYWTQPA3LMrUuTfUHhYZ3YwNeOoPJUTbiLJjXmGe3LvbhiM0vJ g+8rZx0lfTIwaBstBtBB/7FMKtdziHKE5RkAd0tY2MYycI8DIZTo+4ldFQrHaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755910751; 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=7h9st3jxUcGiWgUZBd6eTZ7DffOzM7vJfCNkNMBTNUY=; b=PmtZGiaAa21rKqewif0zGW7Ff98iY3X4788Fp8pA66oCJefq6Q4rC7WzGrqv0zW3JKd3jk iIOmejOF4uYBJ5Pa145/HKAnqoNeXfNmoNd/0+FbOd2VUuSdkLMUb7hW/s91sWldCxpW3Q KI7ZYhkfdwbNQEjP3F0pGSwpCF3vNXcFDmElMD+OFDKGRxNAvlu6EQyc2HmGAteraVMTuA WuxOXYsXGbYfGWOORDaHVJax691CmugpGBKbpKAqMJKJ35kQg2mO1B9mOQvb0qkjqdaQvR PcIf0eOo0/rMzjpZWU7HigbIexAU238raLqF40uviqDH7CZVmBRSZS6gCo15bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755910751; a=rsa-sha256; cv=none; b=yR5K/VNzg+g+U44rcVpqbGwMZ0gYHt0wI6vZke776GSkQ6VwZMPPLunNHRi2QGtDJDlh5w K2vN4N5+pHgFV4uJZdC7yaiExCjj1Ca0GaNMJv72ddrO/R2pju/p1rvD+6oAxhXQ2EBhcv iklZXViTaxDCQ4F0MYVxfXRGzth4nnjVcQ3ajc49V9sxxoO2EkcQ5oETSmwFRB55zBBhbc YuVtVrOG2MXpJlOxErSyHLymrbBXCzVVPRe8gy97/z+jgqMY+A0XqaeNnY8nOjeiAjiZ0G GBNGirkEy/iaIBKGyOK3xol5QPSE8b/GRcGeXPzaX0KeRhjCq44Zy3pskzyW+g== 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 4c7zGQ5MfGz18cl; Sat, 23 Aug 2025 00:59:10 +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 57N0xAfg080285; Sat, 23 Aug 2025 00:59:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0xAWm080282; Sat, 23 Aug 2025 00:59:10 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:59:10 GMT Message-Id: <202508230059.57N0xAWm080282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 110a2fa97d51 - main - bridge: Restore ABI compatibility with 14.x 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 110a2fa97d513c424105cbc113ab0fc36f1f2d36 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=110a2fa97d513c424105cbc113ab0fc36f1f2d36 commit 110a2fa97d513c424105cbc113ab0fc36f1f2d36 Author: Lexi Winter AuthorDate: 2025-08-22 23:43:48 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 23:43:48 +0000 bridge: Restore ABI compatibility with 14.x When new fields were added to struct ifbreq in 15.0, the decision was made to not use the padding to preserve binary compatibility. However this causes some issues, including the inability for 14.x jails to use bridges, and a failure to bring up networking when booting a 15 kernel with a 14.x userland, e.g. during upgrade. Restore the old size of struct ifbreq by eating some of the padding. This only requires 4 bytes of padding; we have 28 bytes left, and in the medium term this problem will be solved with a netlink interface, so running out of padding should not be a concern. Fixes: 65ed1a035ceb ("bridge: allow member interface vlan to be configured") Fixes: f94c370de6e7 ("bridge: Allow VLAN protocol to be configured") Reviewed by: zlei, kevans, flo Differential Revision: https://reviews.freebsd.org/D52028 --- UPDATING | 9 +++++++++ sys/net/if_bridgevar.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 575669b8bc64..da6089ad16d8 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20250823: + To restore bridge(4)'s ABI compatibility with ifconfig from 14.x or + earlier, the size of struct ifbreq has changed, so you must update + the kernel and /sbin/ifconfig at the same time or you will not be + able to add interfaces to bridge. This is particularly important + if you require bridge for network access during boot, in which case + you should install the new kernel and the new /sbin/ifconfig prior + to rebooting. + 20250820: The WITHOUT_GSSAPI src.conf knob has been removed. This was already a no-op for MIT Kerberos, so this only affects builds which set diff --git a/sys/net/if_bridgevar.h b/sys/net/if_bridgevar.h index b0f579f688ac..5ed8c19f3128 100644 --- a/sys/net/if_bridgevar.h +++ b/sys/net/if_bridgevar.h @@ -159,7 +159,7 @@ struct ifbreq { uint32_t ifbr_addrexceeded; /* member if addr violations */ ether_vlanid_t ifbr_pvid; /* member if PVID */ uint16_t ifbr_vlanproto; /* member if VLAN protocol */ - uint8_t pad[32]; + uint8_t pad[28]; }; /* BRDGGIFFLAGS, BRDGSIFFLAGS */