From nobody Mon Sep 22 16:11:54 2025 X-Original-To: dev-commits-src-branches@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 4cVp5k2dSXz685vD; Mon, 22 Sep 2025 16:11:54 +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 4cVp5k2BVXz3fnl; Mon, 22 Sep 2025 16:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758557514; 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=3YjFMBU277+MKfJ0vbwntZlJqpk8rtg9BM2qfbcID6w=; b=fAGGK1w9uN/cAjO/QSkf3vt+gpI9m6OdhH3qhLiArkwCd5qyOxG5PwCzUZlugE7+Xb0H5e PVYiIaFLrrS9F8//rEjGkivc+sX1PcxXlDojjQx5CztJRQ32EKZqJynKOecaSLzvZmW/V4 bEiuF07TjPWul0rMnciUxzeFGsCvDyfy73K+kGhtfsq8+xuuAJl02fxAJJgcrUH7zq1t6U FmySo0XtRIzlfnhRf5CKl/vO4+FGrgD4LD2ESzTonRDcaJZDxNTg0EMeEQ95U4wEzUMkuP bE0Fn1DMshjPPAOmWeTJYlVpCMyzbOuoqs1fMywHR3/7jzorT71Db3SDvKTmFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758557514; 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=3YjFMBU277+MKfJ0vbwntZlJqpk8rtg9BM2qfbcID6w=; b=AUdABwMg62r1MU2GCNex1EZojBlmSHL1VA9ysnD9XKgLj7HltuwTmaZmND3I1TyZelQQ/K vfWXHzY2QW7X+feMXdUwyZGH+faqRW/clsICNXiPVXgaKaUcukWtGNGTp5RNuQ+CcHvZcl FYH0HGLIfuI1cNLH4wT5nKfO4YJiw4VaBkpUeW7+UULgm/xJPi8GWZ6QCIbOc5P42umEjH 9JRz17NednAV2wLTOjFxarB9rEhaH7QtONVOXErsAakfelVw6JfZnewsjg/aDqoycyq+mJ oRCjkXVHaIcjKYZ8qUYZNAm1SnjazSqSHe8HBjZhRIHU3I9vVRyg6/V8sssnJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758557514; a=rsa-sha256; cv=none; b=ifXOs/ayokECyj+iIFK3yIoa4ipBMCDHbhTSV5fRK+YJA2BuFF4j7YltS3HVsZ3rI+fyQF 4wvBMRPXU2rg+AP1gsv6tz/tRUBdpU9Cad1HNfKORcSpRGbhm1mdsAtYLbZ2ORyVTtfY43 vx7vNpvlG+1rPy74Xuvb0tSw7kOcRitZmxMRO6RAiApN2Q5Gl0YGfCp8rCpu9mLRIo3Wkc d4349K0HvrN6QP2EAOcofXvgzvRXtrtEPMvREgKmegxySZHgyRzKrRx946485I9/OEqZX1 U6ahBvNooS3mGCxWftNb8YnXgjGqawMNb+WWFrRyxHOVtAF3uvrItndPRt08Bg== 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 4cVp5k1WSNz16Lq; Mon, 22 Sep 2025 16:11:54 +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 58MGBstv070259; Mon, 22 Sep 2025 16:11:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58MGBsRS070256; Mon, 22 Sep 2025 16:11:54 GMT (envelope-from git) Date: Mon, 22 Sep 2025 16:11:54 GMT Message-Id: <202509221611.58MGBsRS070256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: 418bf338747a - stable/15 - Revert "linux: fix reporting NL_RTM_DELLINK to Netlink sockets" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 418bf338747ad470ad91fbfe4f2767ab820dc988 Auto-Submitted: auto-generated The branch stable/15 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=418bf338747ad470ad91fbfe4f2767ab820dc988 commit 418bf338747ad470ad91fbfe4f2767ab820dc988 Author: Gleb Smirnoff AuthorDate: 2025-09-11 21:02:51 +0000 Commit: Gleb Smirnoff CommitDate: 2025-09-22 16:11:33 +0000 Revert "linux: fix reporting NL_RTM_DELLINK to Netlink sockets" I received a report that certain Linux application would crash on a message of a departure of an interface with FreeBSD name. Looks like dropping NL_RTM_DELLINK is a lesser evil than relay them with FreeBSD names. This reverts commit 554907bac3b264863a051f75eedc35d180d3e18c. (cherry picked from commit 1014003c538ccf8b258c9f0b11c0c131573a63cf) --- sys/compat/linux/linux_netlink.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index 927f3689e2b6..6aeafe84adc6 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -241,10 +241,25 @@ nlmsg_copy_nla(const struct nlattr *nla_orig, struct nl_writer *nw) return (false); } +/* + * Translate a FreeBSD interface name to a Linux interface name. + */ +static bool +nlmsg_translate_ifname_nla(struct nlattr *nla, struct nl_writer *nw) +{ + char ifname[LINUX_IFNAMSIZ]; + + if (ifname_bsd_to_linux_name((char *)(nla + 1), ifname, + sizeof(ifname)) <= 0) + return (false); + return (nlattr_add_string(nw, IFLA_IFNAME, ifname)); +} + +#define LINUX_NLA_UNHANDLED -1 /* * Translate a FreeBSD attribute to a Linux attribute. - * Returns false when the attribute is not processed and the caller must take - * care of it. + * Returns LINUX_NLA_UNHANDLED when the attribute is not processed + * and the caller must take care of it, otherwise the result is returned. */ static int nlmsg_translate_all_nla(struct nlmsghdr *hdr, struct nlattr *nla, @@ -256,27 +271,22 @@ nlmsg_translate_all_nla(struct nlmsghdr *hdr, struct nlattr *nla, case NL_RTM_DELLINK: case NL_RTM_GETLINK: switch (nla->nla_type) { - case IFLA_IFNAME: { - char ifname[LINUX_IFNAMSIZ]; - - if (ifname_bsd_to_linux_name((char *)(nla + 1), ifname, - sizeof(ifname)) > 0) - return (true); - break; - } + case IFLA_IFNAME: + return (nlmsg_translate_ifname_nla(nla, nw)); default: break; } default: break; } - return (false); + return (LINUX_NLA_UNHANDLED); } static bool nlmsg_copy_all_nla(struct nlmsghdr *hdr, int raw_hdrlen, struct nl_writer *nw) { struct nlattr *nla; + int ret; int hdrlen = NETLINK_ALIGN(raw_hdrlen); int attrs_len = hdr->nlmsg_len - sizeof(struct nlmsghdr) - hdrlen; @@ -287,12 +297,15 @@ nlmsg_copy_all_nla(struct nlmsghdr *hdr, int raw_hdrlen, struct nl_writer *nw) if (nla->nla_len < sizeof(struct nlattr)) { return (false); } - if (!nlmsg_translate_all_nla(hdr, nla, nw) && - !nlmsg_copy_nla(nla, nw)) + ret = nlmsg_translate_all_nla(hdr, nla, nw); + if (ret == LINUX_NLA_UNHANDLED) + ret = nlmsg_copy_nla(nla, nw); + if (!ret) return (false); } return (true); } +#undef LINUX_NLA_UNHANDLED static unsigned int rtnl_if_flags_to_linux(unsigned int if_flags)