From nobody Mon Mar 31 17:31:43 2025 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 4ZRJ8b5gfHz5sKrR; Mon, 31 Mar 2025 17:31:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZRJ8b1cwzz3d0D; Mon, 31 Mar 2025 17:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743442303; 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=rTueZPtTo6m/e0aCH7PP3iR/3XlJJjkUxNWRsFkUz5o=; b=Zb6oP7IkBHo0OPIMKVKApb62+tF4QvYB20XJ1kIKmuECgG5zK1Jz7OF5nLSVfkEeTomelc IKHJp7mcve+siWJNW8oewLyfmkcy8mSxxrd/SH4ggAoe49SZ+lfO9Mfj4t8VNbLEJqs4Vv IxMpfjuTYM7kKKrUEYlCFVuKIqazVa/BXRCL2Feoa6rYwABh7PYyIMfdn3WZzc8t/wrTlJ PoXtKwU72Ic2Y9kxrVINtKOLeyOyVk3pTQJGJjxXQHTWqW6B601rCI7drY17hWLu0AssQY vVDSDVHa6ChDXc4OhM0t2RN56Mpw2xQQBN3Rque1NxCXSgtsScuzf3hbLr6XoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743442303; a=rsa-sha256; cv=none; b=XRw0172lYCQgYfKIunFnfFg/jyZPeCFRhfcDeWiEbcawPkm124lh9lW3kI7+B8Qa9sEtyv jdhEYWqEjrwchCXweuHxxhEp6dXkymRRtmRPdXWFukOGRD+PgIW2ZlyTfCH6XG5r/P0qVp Tt+/bjitDjggdSFaCulSy0UuU4EkLV6MkY72nbL+fO0U0ispAH9f0qFBKR9khYAJnu9z3+ cNqJfJIZxqA4CFNe1ANNvUlJHgfXWYu1TuLZk/nsQrkg+DM+F0r4h+4rttsENRC/TX428Q PCUKKPRAG1fDlfG40EoN4VfwSi+R7kE8eaDMXg6MxMWteO4VqgAjrvtEt/Uipg== 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=1743442303; 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=rTueZPtTo6m/e0aCH7PP3iR/3XlJJjkUxNWRsFkUz5o=; b=mhQu0kSU/hgW8S7Ms3t8pRMD9xi+8sVyiNqwKxhsKti6ULWaAz5tOXPqrwdWmNsDA1mF2H rqcTSjALrlNxvqIn6vaqdjdcPcynrf/GuEhaXu8GUwUohBP9NPJ2m55BH5RXHLBi43N/kB RHtrpTuxGAqJ8tWwMdkFROtYksy0yCKCt6FUsMy8lps4m9t0pDBiVsjflfixrmGMI/O1kc ZsGGL4A2j5zizZUrADjKajBo7GJU9rP+AmefPFbygZ+AqCOxGnfRp6k1UVqlIdFbcuS6v1 M2GGEQgTQLFrb26hlS55s6RMpr0tcNzAa3QcvNU5Ueedic71Iqjh9R5xEMNwlw== 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 4ZRJ8b0zVdzvLQ; Mon, 31 Mar 2025 17:31:43 +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 52VHVhYf036764; Mon, 31 Mar 2025 17:31:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52VHVhXB036761; Mon, 31 Mar 2025 17:31:43 GMT (envelope-from git) Date: Mon, 31 Mar 2025 17:31:43 GMT Message-Id: <202503311731.52VHVhXB036761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: 96e6fc517ffe - stable/14 - netlink/route: validate family attribute 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 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 96e6fc517ffec074dbdb6a44b9c2daa7449fd91d Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=96e6fc517ffec074dbdb6a44b9c2daa7449fd91d commit 96e6fc517ffec074dbdb6a44b9c2daa7449fd91d Author: Gleb Smirnoff AuthorDate: 2025-01-29 23:40:56 +0000 Commit: Gleb Smirnoff CommitDate: 2025-03-31 17:31:21 +0000 netlink/route: validate family attribute PR: 283818 (cherry picked from commit cdacb12065e4d85416655743da5bc6b17a9d9119) --- 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 abbcc075dde3..7cd6e0045f01 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -956,7 +956,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); } @@ -1019,7 +1019,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); } @@ -1042,7 +1042,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); }