From nobody Wed Jan 29 23:49:16 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 4YjzQN6sFkz5mBXH; 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 4YjzQN4lmQz3CMT; Wed, 29 Jan 2025 23:49:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738194556; 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=+hZnu0GxaIhrQkS596uQA46zx4Lpa3gGfAo91qu8mzY=; b=ZAkkozdY6MbQxFYlIZsXXccf639BU+qL0AsHWY6R5LGW/mdhnbKpVJNevjh7eaRZ4ox7kg 7pjilOu5pJjl3ywh+zIXxnHR12A0a+SrfZSGLguZysHkFj/OI/zaBE3If63AbdJCQ4V8jf YXgli/IgxcfviWGPbt5IwqJAVPrdmlJDkt6N1gNqo3T76LOyUbiiSz/GdCpAqlb78UQVWy onSOMS/PftVvDqqPS5mdUGfu+X2yZs6SfoIMMIBy8vtN/kg+VnITHv6hORTDr4QBMZ8JZY KANYlrjVqKjVKZldpXyDpKswV71U7lcSbD1Pex3Hbzbsw7j4lqSMq+FNYFlTPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738194556; 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=+hZnu0GxaIhrQkS596uQA46zx4Lpa3gGfAo91qu8mzY=; b=pKzRC+zYX3qZpmggC/3iCFiV8B4FyJRMk7/G11IPzB5jKlvJHnk3mr8a4XhDlI9CT05GSz WzyvrZhum/d1Rt7TrRPmKsEhAEV4nlKwegLJBkrDcdUuOyPevLGzzlKROSWp3DMWcA26yZ oefMkOU1entOk4vnkr8bmpZlkf13vHNxnTmtmQLcTqBsH991NwWYY6ei5kpXbJQUgk5Q2F d6JIxTJ6HkVX2U80PBv9jTa5WZodAsOP+U04hoeUHIcIUN0O7OEHoVb1GCf7OCfdDXWKPa RjYlGOS0vCaNyZ9bqx4SC6d8LDLLMPiQyJ3pDRu0qZPaEK+++pYeLI0fggmhLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738194556; a=rsa-sha256; cv=none; b=A8qGQKn3EaCOeSnlWEqqd5iGdAkLhhaC5tXAre1j3QDcjIiJNYHRAGBUnf3ahTEildHeZ8 Yx19u430r131lDpZGBg1a5ln+mnAW07jXrs/GQfeMv76itLOMtkBJ1gp9gKthfNVQB0D1f Bfdfios+6vpZSyV4mXovrP66r0ZR1o62XFEdg0DaEKMTc2tgVUuIODpsdAX8bUwL9QHPnJ l8n1rReM0Y8RqK5/peWNH53NToB3vbsp/X4c7FkNcU5H59C2z+MTbodborL+3bpz8R8KHp 91a61MXg6BoYXAeS3kSY0sQhZNQlokaddXLUMy5opgGf+zmcZyRvZj5IFl6Suw== 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 4YjzQN41d1z79C; Wed, 29 Jan 2025 23:49:16 +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 50TNnGbX007320; Wed, 29 Jan 2025 23:49:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TNnGld007317; Wed, 29 Jan 2025 23:49:16 GMT (envelope-from git) Date: Wed, 29 Jan 2025 23:49:16 GMT Message-Id: <202501292349.50TNnGld007317@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: cdacb12065e4 - main - netlink/route: validate family attribute 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: cdacb12065e4d85416655743da5bc6b17a9d9119 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=cdacb12065e4d85416655743da5bc6b17a9d9119 commit cdacb12065e4d85416655743da5bc6b17a9d9119 Author: Gleb Smirnoff AuthorDate: 2025-01-29 23:40:56 +0000 Commit: Gleb Smirnoff CommitDate: 2025-01-29 23:48:55 +0000 netlink/route: validate family attribute PR: 283818 --- 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 9750ad9d0649..30dab2b0d8cf 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -955,7 +955,7 @@ rtnl_handle_newroute(struct nlmsghdr *hdr, struct nlpcb *nlp, /* pre-2.6.19 Linux API compatibility */ if (attrs.rtm_table > 0 && attrs.rta_table == 0) attrs.rta_table = attrs.rtm_table; - if (attrs.rta_table >= V_rt_numfibs) { + if (attrs.rta_table >= V_rt_numfibs || attrs.rtm_family > AF_MAX) { NLMSG_REPORT_ERR_MSG(npt, "invalid fib"); return (EINVAL); } @@ -1018,7 +1018,7 @@ rtnl_handle_delroute(struct nlmsghdr *hdr, struct nlpcb *nlp, return (ESRCH); } - if (attrs.rta_table >= V_rt_numfibs) { + if (attrs.rta_table >= V_rt_numfibs || attrs.rtm_family > AF_MAX) { NLMSG_REPORT_ERR_MSG(npt, "invalid fib"); return (EINVAL); } @@ -1041,7 +1041,7 @@ rtnl_handle_getroute(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate * if (error != 0) return (error); - if (attrs.rta_table >= V_rt_numfibs) { + if (attrs.rta_table >= V_rt_numfibs || attrs.rtm_family > AF_MAX) { NLMSG_REPORT_ERR_MSG(npt, "invalid fib"); return (EINVAL); }