From nobody Sat Feb 18 12:12:21 2023 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 4PJncP5lZzz3s871; Sat, 18 Feb 2023 12:12:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PJncP4yd4z3Fwc; Sat, 18 Feb 2023 12:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676722341; 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=j5ekcG1FDKzNH/+zIq3AFJwptMRYX34kSp9yTp1uqBQ=; b=CxAR5QcOEYWxMI5lyEUeKIocyINno/poyzL7RrFMpM71s4qmjqHMhfSyPKmwf4JrVQbN44 PiaMU5ZzvxBah5kF5HeVEDn+3B9Ym6iWwo1bHndf4T5OFS8f5XbOaBaBECUundKWVgAcuW m2CRecUdbzXwKn4c/83lGPMtyH5+33XFp1Cd32qkNrf+evpfBZeX/jcvdKwTOYogt9m/vU Cgh4mzKtTP+A1dKb3aAGCMEUbqPoVALToXgn7Vvo/GD50aaetR/3Nai4e4sqXeHE1avYjd 54YdqaSgWaCbC56fj7BQor9hpbSNjriGlu0TDzEKgZ660Yyx/q2Et2XvY8wbrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676722341; 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=j5ekcG1FDKzNH/+zIq3AFJwptMRYX34kSp9yTp1uqBQ=; b=Z+IjvMavJFywst1E8Ej6JJAYdw6mmlW3Ja1naccvUQ2kmNd/Ung/b6AiGox6ExHqa12TUU Xyrk7ygbK0h/y/k6aUKBLRk3XAhVMi9NiW8t5CEWmEdpwG1NVla9snjZ8IBXdRI6GYHpa3 4spHNPu72g0mPZRv950Q7z8oCJ2GhXi3o8GZoke0uRdDZHBzjqulvGp/2UkeEYGlsBkcvQ +9VIBRv0Jv6iBTCN6UDvotJ95sekG8s0pWu2r8X58TEnjPjSQrCGPKzSlCY99HUzfGiZwH y9ZCT/sViqmUFq2edZN98g6p88rNDFKZQkZPDWjqhC+1pcQrSTQkTO/uap8exg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676722341; a=rsa-sha256; cv=none; b=XxFaAwXAYQ4aQfmpqX4TpUFaQBRai1+BJW+0Vym27KGFnHjVs3yM34BAoSV/tJjjFJKimH 1u0+Z/eMxZmBv0J3M50EZ5UW2IDzYgcSmIcyAw1AjBELMau+TdniPV8to9oEeuKJVxgh8d 7kUaL/IVTytff+FVAv9JsmUnkhP/eJYl7eNXvfjjXczyq/zIn6lMoqBBNSPlrLa+JKh0bt APU4uFEw953117NVXPknAGG5JR5erizc5gv6Rc9mSvtaEbTAxxeFQJ10s1NdeUImK6tUhl XcleKldqihW+L3DQtunPsk99RMdRWjW8PDB+4QQXL11tIM5wfR5VUpDlM2whJQ== 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 4PJncP43KhzN2K; Sat, 18 Feb 2023 12:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31ICCLLw097762; Sat, 18 Feb 2023 12:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31ICCLCu097761; Sat, 18 Feb 2023 12:12:21 GMT (envelope-from git) Date: Sat, 18 Feb 2023 12:12:21 GMT Message-Id: <202302181212.31ICCLCu097761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: e9296dc1bcd2 - stable/13 - netlink: validate rtable value in RTM_ROUTE. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e9296dc1bcd21cd9d719389cd04235ce4513e84d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=e9296dc1bcd21cd9d719389cd04235ce4513e84d commit e9296dc1bcd21cd9d719389cd04235ce4513e84d Author: Alexander V. Chernikov AuthorDate: 2023-02-17 17:31:40 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-18 11:57:11 +0000 netlink: validate rtable value in RTM_ROUTE. Reported by: Stefan Grundmann MFC after: 1 day (cherry picked from commit f2f7911c5513096e46422ad7756bc90c13c6e6d8) --- sys/netlink/route/rt.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 59b34c53ad4b..aca69e75fea8 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -840,6 +840,11 @@ rtnl_handle_newroute(struct nlmsghdr *hdr, struct nlpcb *nlp, return (EINVAL); } + if (attrs.rta_table >= V_rt_numfibs) { + NLMSG_REPORT_ERR_MSG(npt, "invalid fib"); + return (EINVAL); + } + if (attrs.rta_nh_id != 0) { /* Referenced uindex */ int pxflag = get_pxflag(&attrs); @@ -898,6 +903,11 @@ rtnl_handle_delroute(struct nlmsghdr *hdr, struct nlpcb *nlp, return (ESRCH); } + if (attrs.rta_table >= V_rt_numfibs) { + NLMSG_REPORT_ERR_MSG(npt, "invalid fib"); + return (EINVAL); + } + error = rib_del_route_px(attrs.rta_table, attrs.rta_dst, attrs.rtm_dst_len, path_match_func, &attrs, 0, &rc); if (error == 0) @@ -915,6 +925,11 @@ rtnl_handle_getroute(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate * if (error != 0) return (error); + if (attrs.rta_table >= V_rt_numfibs) { + NLMSG_REPORT_ERR_MSG(npt, "invalid fib"); + return (EINVAL); + } + if (hdr->nlmsg_flags & NLM_F_DUMP) error = handle_rtm_dump(nlp, attrs.rta_table, attrs.rtm_family, hdr, npt->nw); else