From nobody Wed May 13 11:26:33 2026 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 4gFrky1Qlmz6dF33 for ; Wed, 13 May 2026 11:26:34 +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 4gFrkx4hQjz3ZRZ for ; Wed, 13 May 2026 11:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778671593; 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=MbYL3xQ57cZnjqC7wJ9sDrCscgCq6PZL0Z8liGAng9A=; b=aJ1oV19BuYnuFAnL7DVAOxRxc2xRPmaUBonkg/PrGLLhHNjfT3BfxOX10yifn4ynpImmip DlQWRntKZAzJTUs4SolAOQlMQnOlKJTgBS6VoaDd6nXV46OswqH+IoSCD/F/grjGjpSXm3 40smZT6MGhJhAK3BZDBT7iw3jcxr3NzexgeSaddNs/88QS6fq77mt3nO2fJ4sWDVsoXnTF ldmN2+FBYAyeo7rR4NYbLMvKA5C4Crz7F9wvI8iny1ExMopEiqvJYa0Pag9/1zFc85J+Ma WwI2kPMWb2Gnyn06vTx/DdfyjsZ8Z3eC3d5Tqg7nHvtBnmXRs2jUp2ri7fo0gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778671593; a=rsa-sha256; cv=none; b=yFcbj5kBrjc91Fa3pgUK58BuHM+x6twpZdWp+MxGkLYkLheRRNei0cq3Ikc7452Lzkq44Q e4j5q4pG1qhYrulXw3Ns27/d7nR1HSUWebXOHgrlY0t/ZZqMX/FXyyneEEZ04/kBs/g1mt 3UifJOMN5EjW8GnY7+1qgu1wfC8o2oT+NdAtZg1ruBVimOV0vAsMuGD11SU3z7Hi+1Ux4Y hxse9Jbb1O5nCuZeVg0bZsZbBpcmR0Q/+6Mqe+j4yGpnksuSOZy8lQ5tMQVr983xgUMNF2 pA3wV5JWFO92iakcM5ZVgoYfain6bt912baqdEB6S83j0ItvbzYOS2IIIVo0pQ== 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=1778671593; 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=MbYL3xQ57cZnjqC7wJ9sDrCscgCq6PZL0Z8liGAng9A=; b=GUj1rGJUfSYFCHfou590w5fl3tllSTEuAslLelu6RXm2uniljRkXHp21F1O8A4HGMmUPPL VkU18XPhSsFw8Dd3h6YL+sM07ScoYKThi6es2TYIYJjucOJ18I1NKG0cgqFVkQJjFt6mLy voc6aJsEIqX6BbHVDIvn/txVSbs5wXAysMGm+BtUpKjV17759XsXrLd1VEMUUxgTYNmArX T4uP+Qz0foTh6u9uaBNAuQVnnyzz1ZqlxGOxM9Z1dTIN+dj80j6kbAy044xBwvz2L0okvW pK0kSO4L8AjZ8U9l35ewZRjrRFP8KUlns7E5FGh8n+Wb2j0R7+C5m3HM1WNtaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFrkx486tzp60 for ; Wed, 13 May 2026 11:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43907 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 11:26:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 4329663a861e - main - rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get 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 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/main X-Git-Reftype: branch X-Git-Commit: 4329663a861ef74796b79b6b0872cfe10d31c591 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 11:26:33 +0000 Message-Id: <6a045fe9.43907.49e26815@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=4329663a861ef74796b79b6b0872cfe10d31c591 commit 4329663a861ef74796b79b6b0872cfe10d31c591 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-12 11:34:28 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-13 09:44:28 +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 --- 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 4d7b0a3e1fa3..dfc501e11299 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -479,8 +479,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); @@ -494,7 +495,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); }