From nobody Sat May 16 21:33:02 2026 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 4gHy3L62XRz6d6d8 for ; Sat, 16 May 2026 21:33:02 +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 4gHy3L5B6Jz3p8h for ; Sat, 16 May 2026 21:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778967182; 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=SoRard80J+gNIx+OIGQBUzEBKiyqyP2pebtC9sqycdc=; b=SHR18u5lkFBMQhuasbD414Fkpupy7a/c705sSq6C15zXs/OLyKM5/Xf5hB1ZftrEyRccru WztTR4XxE1C4s1Tu8VX+Vnb7Qt0x62RNst72+iRxqNdEUav+IcRvfHhYVsef8/Inkc+/QZ p+F1T6rUfJJHeBLsCzGArVWRRL26q+GBEy6EXMMPj35qksNzWeHXgcyDfs7AeurPFLsmGh 4w3ybMMO05Wav0EX9bmsKKwkD1xDhyHKjarQN7AgPpaE7/VUnPOCm18mWvpqNfPcTwvkls KcT0ciZ/0kNB6HLA0gIQtROZWcNY+qlLwLjYmtdFy1IGdOra/HkuqBTnP9QnDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778967182; a=rsa-sha256; cv=none; b=yGL1t4FVsjW+P31FOCd++XtDZPhY7CUUZxCYGq99cOACR5715NISRWZyK+QY3ZC/pAWhk3 o56V6jWdb0Q9mEuchsxQWRjMTHgBmJqzcsPaXNB682/yOyMX96Yrmx0chQxvzz5iL7x866 o3+pCagIBvVeafSzztnS6cxvtCrEADNh6jm/xF4thb0ppGpzfXyQk7mO6MzDDvQ0rtNy89 oWLLpqLtDrYIVvddvGidpmhHqDeuAjsVWgiInztUdWpiH2Zr3s4rPG1fqIVEoSTD4vH80h mGs1pYZSxjIu0IFrLL635IioH9ly8JhW+rJZxTCWbhXCfUX1iPgDMQELCqW/zA== 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=1778967182; 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=SoRard80J+gNIx+OIGQBUzEBKiyqyP2pebtC9sqycdc=; b=apxr30/QZVRPZGlvEXlBSWbb+EW5Mj38eL81pnOr7vnVWJxM/56VbPi0PVwQcEZ2c+d55i BmKgzcmeckvqZRqRbz9VGh7tfGuPcT3h/NMfPYF8DNCJj+h4XXYXUirEf8FCUqkTYSKzVw yAhPk2omgxmh8oyPWfIznCWJyZ9DtxEB9jv+cAxtlzEe+/S5da9m54tQBEPNOIS8k4qNRA Iks9iSArvDX/CmcIl/mlV9qU3X2deI/ZBocIji/IPrzw9AiPIweB/HiwNzYvvZYGXrwGQN dgWxV+sC48Ww4ouUZFUZrCsZQqQ9cTt1LK/t8NkuqADFaQZ44H/d6Iwr00hokA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHy3L4hNTz1B73 for ; Sat, 16 May 2026 21:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e9ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 21:33:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 44be923a2b6b - stable/14 - rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get 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 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 44be923a2b6bacd664b7e87e486cccd6fcc7cbad Auto-Submitted: auto-generated Date: Sat, 16 May 2026 21:33:02 +0000 Message-Id: <6a08e28e.3e9ef.c86f21b@gitrepo.freebsd.org> The branch stable/14 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=44be923a2b6bacd664b7e87e486cccd6fcc7cbad commit 44be923a2b6bacd664b7e87e486cccd6fcc7cbad Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-12 11:34:28 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-16 21:28:09 +0000 rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get Fix length validation of RTA_MULTIPATH attributes in nlattr_get_multipath() by making sure the user request is align. PR: 295102 Reported by: Robert Morris Reviewed by: markj Fixes: 7e5bf68495cc ("netlink: add netlink support") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56963 (cherry picked from commit 4329663a861ef74796b79b6b0872cfe10d31c591) (cherry picked from commit 2c6617658f0cabb1e83a47da02882454e4210bd9) --- sys/netlink/route/rt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 7a6ba6ef27c5..8e9203182d76 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -448,8 +448,9 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { struct rta_mpath_nh *mpnh; + len = NL_ITEM_ALIGN(rtnh->rtnh_len); if (__predict_false(rtnh->rtnh_len <= sizeof(*rtnh) || - rtnh->rtnh_len > data_len)) { + len < rtnh->rtnh_len || len > data_len)) { NLMSG_REPORT_ERR_MSG(npt, "%s: bad length %u", __func__, rtnh->rtnh_len); return (EINVAL); @@ -463,7 +464,6 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, mp->num_nhops - 1); return (error); } - len = NL_ITEM_ALIGN(rtnh->rtnh_len); data_len -= len; rtnh = (struct rtnexthop *)((char *)rtnh + len); }