From nobody Wed Jan 29 23:49:15 2025 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 4YjzQN00vKz5mBXD; Wed, 29 Jan 2025 23:49:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjzQM44z9z3CS5; Wed, 29 Jan 2025 23:49:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738194555; 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=eZ4YKT9o9ZWBvbHd1dx2BQTr45TPfKI7PP+Z2z1M5mc=; b=dPdT7LLMOBtBpw+B8b4riEoV9I4t8VnxpctegpdZ9KZfzKx9+HEg/+UjJMJ+AMZjkvkap1 85kP1pejyhPXmQyrUR8j4eCH7jYsnVMf2aj9H8m+LyZ4zfyEopjsOTUHJlgLBQqriINVKo 5PNUIwBDP7dB8z01oCR3kzASAp1WVlYPf4tT9BRJo2wxvLQtNPVfAKEd9HjPmP9OK1tI3d Wo/OKMTLnqUj6P4NPWhxVQm61vEG/HHOrB8T5hqr3qDTxVpDjLD7dQbxCzSOdX+8lbO6VZ KW0xqTp0ih3+fvVT2ZCewPatRzxvhjEXSV711ZvP5lMkWoR+o6fVnxjb2nl3Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738194555; 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=eZ4YKT9o9ZWBvbHd1dx2BQTr45TPfKI7PP+Z2z1M5mc=; b=n9BjojyAyw0Hw85+9cMr8FiHyMMUo7wWSAPBLbnRVy4/gMJC+ueGCDsQUjloNvaCFK0bR+ Bvb49Wda3avvITg8TRKJJVW/FUpUJewZse0gDVbdsQbnFD4YUFJ4EAN1TAFifLMGCpKFYf vWDNDassruIr/6O5iRYHvuAhxhToYIogVxgSEGI8a9E08PwdQLcAogSVTSNrOiqJrQqiWw nOXadtCgnaf6QzeMLU6aR2fcRWS6ckNZE6BGBVn9VVci64eyd4Q9ySS0nMG4Ldr1qngVbZ WIiTNhKjJWs4DAklLdEBLDLPtRCW0bDCT5m84cYaUrlVLlDaeHrf8b3vC5JNPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738194555; a=rsa-sha256; cv=none; b=ZHw2sAUis8XucOrkkl5c8vm20ZOLu8tdtpQs0uUmBkArgg+unuV5DHMDBXY8IDtsHBroTL BOhNygTiZ+xzkiYFFrjFZZzLGBgB58DdDFahGWYVC2eO41QpeAVZvTlml/CW3sv3GezKOq gCb/XZvvoq+8QXZwnYv/Xx1VdOIPm+qWsSm3IAe8ZaoPSOFso5UecrAV81o9x6NWb2AJvv YSPqjGi48689WZTVfIgHwm0pooEHJhGYQRfOHkrOMOuAVPpXpT7F/UrTvUUxBqNcC3y+Cd G7/brJY+6rML1QTPQjVcjola1Mj5A1M03/r7bQqJO+UzhlLrdB/D/DZ2IFRS2g== 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 4YjzQM3Qxpz70f; Wed, 29 Jan 2025 23:49:15 +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 50TNnFnK007286; Wed, 29 Jan 2025 23:49:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TNnF2P007283; Wed, 29 Jan 2025 23:49:15 GMT (envelope-from git) Date: Wed, 29 Jan 2025 23:49:15 GMT Message-Id: <202501292349.50TNnF2P007283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 031fbf8dc962 - main - netlink/route: fix fib number validation in old Linux compat mode 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 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/main X-Git-Reftype: branch X-Git-Commit: 031fbf8dc962ca8d458b217ba2b4a9e637b7e932 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=031fbf8dc962ca8d458b217ba2b4a9e637b7e932 commit 031fbf8dc962ca8d458b217ba2b4a9e637b7e932 Author: Gleb Smirnoff AuthorDate: 2025-01-29 22:06:57 +0000 Commit: Gleb Smirnoff CommitDate: 2025-01-29 23:48:55 +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 --- 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 1ee18f994c65..9750ad9d0649 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -952,10 +952,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); }