From nobody Sat May 16 21:22:06 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 4gHxpq2pCSz6d5YQ for ; Sat, 16 May 2026 21:22:11 +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 4gHxpq2FX1z3nGy for ; Sat, 16 May 2026 21:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778966531; 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=CDYKfU7+72Tx2niolu346e6Is+s7i7xwwXzsc4KREnY=; b=XGWXxi4463XmzDC4daXxMO+IWgEMBuexLsekAMxSdAy87d8dmTy9qdsgnjLHMo/YypL83E hp28fNkS3Ovp0gZwGkiVtIm7IB1UoTZ1K39CbOrHFDxG84Ibkfar93gqmjoG9kBeH6WKup Q6bBf7prWmB+OO2dYGQmkd+q/HIV5N51U0zMJcm5U3RJB5xb5odvBlr3BclxGV0VbEfL9n DMngWQIFk/vIl1GeIOAuZcONm+/9EPAAkjQePgn0UImazgqnWGXWy0eHwpNkHRJItt27qu emU1MuaSwG8vGTwnRvAZaFgxyz6TX9LkJ2vRNoyF8PmnXlhvAvb5ZUa+Rv+QGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778966531; a=rsa-sha256; cv=none; b=tRiTbXQEfwZeY1mvBLP3E9DAyBveGcz/q4vH39DLETkKUcU48TTTrpthCfeTPHEoiDpryR s2bQ7723MFr2wWiYKjJeMrwQj6fXw8kQcC8YBTZ5ztJJ/akhQHfowf+Zc4BjF0OaMLPPOm 9/qqCH5g84TNSsNgaB27w4JJ6BlxcRAFwtYHNQhzLCoXmesB0f+p3xInQ86kCQI0UMA897 a04ZSnYbObJGLhGnShItLwGFnrxsfWRkdmXZG/rOsWeLrW+YWZzMThgKaTba5AMO1FooVu pf8w/Sxr2ujU4BcdH8FXZ2gPKEkeaS9Y6T8sZAr3bhbci/WdSqX2ArAtXwXs+g== 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=1778966531; 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=CDYKfU7+72Tx2niolu346e6Is+s7i7xwwXzsc4KREnY=; b=ll/hhXVkP6wjOEnHhZliezWNpsQYHPnlnVm7xQ0mj2Z7teRM4njpotdNJiVA7eJ91x1URm 132ODHrRw4nwrXEnE8eCpYteSyTPKex9cjjx0hCqsaUCzEeVx5E+LTYulcwaHlrBRwvoM8 BcZtaabew4jNz/CJYIxg4Qx9DJmBDax0n3naF1VMscl2kV2GdoT4H6u2IHc5OObu6Ksfba UyL2/rcIXMoFyI5RRxpSdhuLzSCg1AACTjr8Y+yQJsx+zkcsEUj1tnL8LO9lZYhgehcwkE /gTj/9rzahMNmLlhjgJBvla+B8E3OJwQoUfPqerzNS05BOVJHFLEMFc65+RG1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHxpq1k46z19mW for ; Sat, 16 May 2026 21:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f315 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 21:22:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 2c6617658f0c - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 2c6617658f0cabb1e83a47da02882454e4210bd9 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 21:22:06 +0000 Message-Id: <6a08dffe.3f315.34bbd51a@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=2c6617658f0cabb1e83a47da02882454e4210bd9 commit 2c6617658f0cabb1e83a47da02882454e4210bd9 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-12 11:34:28 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-16 21:21:50 +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) --- 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 4d7f676d2aec..7641417a8e77 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -452,8 +452,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); @@ -467,7 +468,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); }