From nobody Mon Mar 31 17:31:41 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 4ZRJ8Z35srz5sKxy; Mon, 31 Mar 2025 17:31:42 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZRJ8Z0gGMz3ctj; Mon, 31 Mar 2025 17:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743442302; 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=0ZL06qbk139NWkcizBYR3A/+K7Zx4L3FazQQi5tybi0=; b=QjKWRbKo5+itAeU0KiD/WhFhbMNNKgBeVPIJsRzs0htUtVEWPbgEwCl1II9m5vBgdQGr2X dnXVXiFQskmDe493cHNW5Q7AbaqJkOafTJmIOXku11+nMTsVxov62c4Y2NOJvPEEzsjxS2 hwbWJvUnholZohMsyiXsxEyT+EMXepxunWX1Bj02LZSrV/grGMhccLqtfJju3ZqAa9Xa/A S5iQndk/OpNc6YuraiIR+UgjgYKIdYHe8JbPmi6lmymJ6W05928ejUPeeGVSV9ngxzolA6 wnaOYYtpPkyCCw5DpQiMHbf2KxPQLK1/0NmZtBvRFhrElARcA/zzC+3c/rmdMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743442302; a=rsa-sha256; cv=none; b=mUo4x/Cbe3CcKiBnbSBjtcrA9TT1rk68HZxt3Nsk/WygiEvPfSWNDl6FSWPBjrONA7f48D 0++iRZLK15+yte0fbb8+xLVc5dUPW6DQmgb5vyyzcswa31/cIHh78grH+fZxPVBsRTnqiI qm6hPyYmmxM8EEIPP6A64sPkBA7LEny9mo5t85mp3YIQhW5alTgedPFpY0KnyqThsRCmL/ I+3MFNAFrPa9+5W0eeZk3hojoZwqiKRCpuh4deQ7cc7xXTDAesELIUr+7OUyNyBw78AA7L gLWXm48QVspApwUqpLWunBzH511Z+njYhdrMCCzbkcrRQVxD0i1U0PCpH2D73g== 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=1743442302; 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=0ZL06qbk139NWkcizBYR3A/+K7Zx4L3FazQQi5tybi0=; b=Ahwnz0wdvhzOtvKVxZScmuEnnQLai3psNvsdV7+wDUF+kNILPPYJmPF3D2iKIDmugFblZK nwBCiAhBkXgkE5eLOcQtzKrtnS4he91I1luROdrwhaw55lfD//njBBZ/6AuG5BnTM9GWak ycgh7nQK4MRnmAavsyR+fZ0GYG02ItvhEp00TO8Q21pjQgH/GL779/WesbN7GVy2CuF/be c5iK3q2jdOj6RQjGdwz2O5bmdIVmNeuuyPtcbMMcztfsMmcAh+dz3hkYUB3LdRNUVKpCa/ nVxSxmaOQsJFyMMyRFD3joPtg/dKbbfEB6jtvT1zC+1FbU+8W1WrS0gIJaqN+w== 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 4ZRJ8Z0HC9zvFd; Mon, 31 Mar 2025 17:31:42 +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 52VHVfQw036731; Mon, 31 Mar 2025 17:31:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52VHVfZW036728; Mon, 31 Mar 2025 17:31:41 GMT (envelope-from git) Date: Mon, 31 Mar 2025 17:31:41 GMT Message-Id: <202503311731.52VHVfZW036728@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: f2a49434b550 - stable/14 - netlink/route: fix fib number validation in old Linux compat mode 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f2a49434b550df350bb5b311f701c6e3e6d9af36 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f2a49434b550df350bb5b311f701c6e3e6d9af36 commit f2a49434b550df350bb5b311f701c6e3e6d9af36 Author: Gleb Smirnoff AuthorDate: 2025-01-29 22:06:57 +0000 Commit: Gleb Smirnoff CommitDate: 2025-03-31 17:31:21 +0000 netlink/route: fix fib number validation in old Linux compat mode The value passed via old field also needs to be validated. PR: 283848 Fixes: f34aca55adef1e28cd68b2e6705a0cac03f0238e (cherry picked from commit 031fbf8dc962ca8d458b217ba2b4a9e637b7e932) --- sys/netlink/route/rt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 410b1b04b6fc..abbcc075dde3 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -953,10 +953,10 @@ rtnl_handle_newroute(struct nlmsghdr *hdr, struct nlpcb *nlp, return (EINVAL); } - if (attrs.rtm_table > 0 && attrs.rta_table == 0) { - /* pre-2.6.19 Linux API compatibility */ + /* pre-2.6.19 Linux API compatibility */ + if (attrs.rtm_table > 0 && attrs.rta_table == 0) attrs.rta_table = attrs.rtm_table; - } else if (attrs.rta_table >= V_rt_numfibs) { + if (attrs.rta_table >= V_rt_numfibs) { NLMSG_REPORT_ERR_MSG(npt, "invalid fib"); return (EINVAL); }