From nobody Fri May 29 23:11:31 2026 X-Original-To: dev-commits-src-main@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 4gRzd02YBDz6gGXC for ; Fri, 29 May 2026 23:11:32 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gRzcz5dMwz3WwY for ; Fri, 29 May 2026 23:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780096291; 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=/elXd4oReAjVvlVVMyiuzgrX4MtpE0xlWUCvDV6o7rA=; b=nMoEWcIE+DqVgdCFy9TNf0zfdtw5g5bfx3S/eQu5/3Pd/xtMyoEAX3qhtyLUv9bqYFR/oA 1aOzr31rfoHTTFCN8Yr6YdrMARFbvYTBqgV7oO/Ye3mAv2KTOMtzs4/8lTlbE8iWx3fLRM TVdLlVFY9TQRj8nRYriQ/FqNYAZWWNYhNxRb9QdJwt3A34z0jTTnkKqjwHnvFY5QkmWS85 bz59qm3N1DZqESW0z6GEkh6Aif2XmLtsIerDsHNmxpcjlTEsq8QyzYQOWbCoh+OSBfnazM DQ8KDn/sIoaXJRcnI4WcjLOmDDqHNOLwBX6UlowcpVTMru4NrGJ51xjej+eEdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780096291; a=rsa-sha256; cv=none; b=ctVK6FopQzBr5PtLushhW2u1QckM/Ralo7r0fHE0zUfU56N3yENQvQnvXneQYmirq69EC9 iLAneGhckHzSt7C6Wmd5E5DOPeieBfPW6A4hg75Gt5pGvTCDQDzJiFUL6utRz2n3ifTgHr 61z55CHqqnYR6/T4rpmG1Kea9niinuaysS+AGrPH+APvF3QBS4/H7SFFgftg3+zcHMaexx 7C8R7qULVv862LQ35U9lsW+ZVc577y5bnIRmAvFngI8Nxre0bvX9pFXD+OImHy9ST1jJYS 4kvJSFJ5pOc0kXIRdmSEnMke6yfcAj1bv4xaLcyVoxYs/9eVrum4OiXCoUtWrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780096291; 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=/elXd4oReAjVvlVVMyiuzgrX4MtpE0xlWUCvDV6o7rA=; b=lRWz58QJkqmXqyEkEidqiBw2dTkWCl6MMVavcgoBZQARH00hVlykas5y6EocVXawBDJKuK XFKdXa2d5K6pbWFYIjLpVA2XNMiq4R8m169i/PLU+ZwD7W7ZB2YmpdoLaYxSr4zz1NIRs8 bgP/ZJRLyTOvPK3KT/a/uA8cJTuC9xz1yy9UQsbQYo9dtVJAmla967AYuKxiQhfZuhG56A 8QsSag1o54YXamohiFGyTvzxNEGwqAjUzhAKBlCssTQkIUSNOEjO3vBQ9TZRpULSJQo8ia A3G4QO8QZBU8+lIYdZtsN4fEe004gR7+/44TuUW3xRL/U5wxxyJDF98WeP7aJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzcz4zR2zvBw for ; Fri, 29 May 2026 23:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 432b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:11:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9ddb6064f815 - main - netlink: Use early exit pattern in _nl_modify_ifp_generic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ddb6064f815ebdd0cfea4b2e0d3b6f0c98ea072 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:11:31 +0000 Message-Id: <6a1a1d23.432b1.113a7418@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9ddb6064f815ebdd0cfea4b2e0d3b6f0c98ea072 commit 9ddb6064f815ebdd0cfea4b2e0d3b6f0c98ea072 Author: Ed Maste AuthorDate: 2026-05-29 21:08:51 +0000 Commit: Ed Maste CommitDate: 2026-05-29 23:11:21 +0000 netlink: Use early exit pattern in _nl_modify_ifp_generic No functional change. Reviewed by: pouria, melifaro Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57349 --- sys/netlink/route/iface_drivers.c | 53 ++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c index 31d2523a479b..d26e92044ff5 100644 --- a/sys/netlink/route/iface_drivers.c +++ b/sys/netlink/route/iface_drivers.c @@ -69,17 +69,16 @@ _nl_modify_ifp_generic(struct ifnet *ifp, struct nl_parsed_link *lattrs, int error; if (lattrs->ifla_ifalias != NULL) { - if (nlp_has_priv(npt->nlp, PRIV_NET_SETIFDESCR)) { - int len = strlen(lattrs->ifla_ifalias) + 1; - char *buf = if_allocdescr(len, M_WAITOK); - - memcpy(buf, lattrs->ifla_ifalias, len); - if_setdescr(ifp, buf); - if_setlastchange(ifp); - } else { + if (!nlp_has_priv(npt->nlp, PRIV_NET_SETIFDESCR)) { nlmsg_report_err_msg(npt, "Not enough privileges to set descr"); return (EPERM); } + int len = strlen(lattrs->ifla_ifalias) + 1; + char *buf = if_allocdescr(len, M_WAITOK); + + memcpy(buf, lattrs->ifla_ifalias, len); + if_setdescr(ifp, buf); + if_setlastchange(ifp); } if ((lattrs->ifi_change & IFF_UP) != 0 || lattrs->ifi_change == 0) { @@ -91,18 +90,17 @@ _nl_modify_ifp_generic(struct ifnet *ifp, struct nl_parsed_link *lattrs, } if (lattrs->ifla_mtu > 0) { - if (nlp_has_priv(npt->nlp, PRIV_NET_SETIFMTU)) { - struct ifreq ifr = { .ifr_mtu = lattrs->ifla_mtu }; - error = ifhwioctl(SIOCSIFMTU, ifp, (char *)&ifr, - curthread); - if (error != 0) { - nlmsg_report_err_msg(npt, "Failed to set mtu"); - return (error); - } - } else { + if (!nlp_has_priv(npt->nlp, PRIV_NET_SETIFMTU)) { nlmsg_report_err_msg(npt, "Not enough privileges to set mtu"); return (EPERM); } + struct ifreq ifr = { .ifr_mtu = lattrs->ifla_mtu }; + error = ifhwioctl(SIOCSIFMTU, ifp, (char *)&ifr, + curthread); + if (error != 0) { + nlmsg_report_err_msg(npt, "Failed to set mtu"); + return (error); + } } if ((lattrs->ifi_change & IFF_PROMISC) != 0 || @@ -117,21 +115,20 @@ _nl_modify_ifp_generic(struct ifnet *ifp, struct nl_parsed_link *lattrs, if_setppromisc(ifp, (lattrs->ifi_flags & IFF_PROMISC) != 0); if (lattrs->ifla_address != NULL) { - if (nlp_has_priv(npt->nlp, PRIV_NET_SETIFMAC)) { - error = if_setlladdr(ifp, - NLA_DATA(lattrs->ifla_address), - NLA_DATA_LEN(lattrs->ifla_address)); - if (error != 0) { - nlmsg_report_err_msg(npt, - "setting IFLA_ADDRESS failed with error code: %d", - error); - return (error); - } - } else { + if (!nlp_has_priv(npt->nlp, PRIV_NET_SETIFMAC)) { nlmsg_report_err_msg(npt, "Not enough privileges to set IFLA_ADDRESS"); return (EPERM); } + error = if_setlladdr(ifp, + NLA_DATA(lattrs->ifla_address), + NLA_DATA_LEN(lattrs->ifla_address)); + if (error != 0) { + nlmsg_report_err_msg(npt, + "setting IFLA_ADDRESS failed with error code: %d", + error); + return (error); + } } return (0);