Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp1864594rwb; Fri, 19 Aug 2022 10:39:38 -0700 (PDT) X-Google-Smtp-Source: AA6agR5zykKA4lod7+wD3wKQ3gvkpzcTndEIUwxHRQtWHLIcsR1sajEENuLi5EAjFkI01HrXIEGm X-Received: by 2002:a63:8b43:0:b0:41c:cb93:cc54 with SMTP id j64-20020a638b43000000b0041ccb93cc54mr6982264pge.562.1660930777994; Fri, 19 Aug 2022 10:39:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660930777; cv=none; d=google.com; s=arc-20160816; b=Xm9w7+MNI8URVvl9EaMuLeFCzD3A6nLFScD4o9BNtti1SRJgeq+vXxRb0UAsD5GwUS R3j6FKF5c1X19OR9jgR1DdtDnZBIdXzyNk+AX2Z9pELHKeJ0Kh2iuEkc6nG+S5yf+1c6 SKkub8veP9+RVpmnH22+Ts/ZFU/Jqafgc5kS9CplGNBG7elVKbmufB98AeFHMwASnfOS uBwRJG98z0D6Gmy7ACNYiqVvmjPoPPP7nHeLcu2c+L6Douc+SKzYVobNQdPewIQAA9hI +P98pIUejo7RjyGbTuEebSW7TDAQhxjY4gcjXjFm3ycBhqVAHMa0FbzGjKV1hzIWangY CciQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SXu/70/3r62LopkQzTV6hcPtXbypHPKT9nRA8O2+GjI=; b=BVebH6kJpGtbqGE/tAHZZYzKzPKgqP5brKW73JJtrioAwLP17LJc42rO5ThmIX5YPV 18HCUIbAT/gjAx9lyH8reWC78RbcWogvGcPGwtFCoyQqdSavlROvgvcq3oSwg/yqlneE 8vBxPwq8tz1nWJYu9BWT4NpqjCqjLFv+oGsFE1wrSyg6Z1b5OKfgjuql9UsDkYdXxPE1 9dAWE42+UM6FH8CBnm2TBiuSpPHezt6aacsGNhpTzqec+U4EE36D3pXun36O1HZjRHQ8 uqVc9i2FuoskD2idyFE054SJMmzNXf6UYe8mwlpPjHhPpAbaJtqbdCuCCOxiaaTnTPOw UFiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="uj9mV/ly"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a17-20020a63e411000000b00429cf3b6637si4453000pgi.697.2022.08.19.10.39.27; Fri, 19 Aug 2022 10:39:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="uj9mV/ly"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354420AbiHSQyv (ORCPT + 99 others); Fri, 19 Aug 2022 12:54:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354403AbiHSQxa (ORCPT ); Fri, 19 Aug 2022 12:53:30 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 617BC12E3D2; Fri, 19 Aug 2022 09:15:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 4BD55B8282A; Fri, 19 Aug 2022 16:13:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8800EC433D7; Fri, 19 Aug 2022 16:13:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660925625; bh=QXKbbD2rBMM2SVJ7jtAh4BSriiVTIwVcRFRHymGJ04g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uj9mV/lyYM3/UHZ8IBKacVxZEWz0TKuR2jWLCDjH/OIFvvBufkSXkGwV9nddidhHN vKyhZ8M01PDXpPATiy6LKebtLfM4jhp4ZazhhCjV4wjdqx0aqf6P/DQQn/D6k0IUYy wC7SgPQo+kGwIgCfwQQYCvtyVa59Z/vWSQvKTyPs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jamal Hadi Salim , Stephen Hemminger , "David S. Miller" Subject: [PATCH 5.10 542/545] net_sched: cls_route: disallow handle of 0 Date: Fri, 19 Aug 2022 17:45:12 +0200 Message-Id: <20220819153853.863593552@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220819153829.135562864@linuxfoundation.org> References: <20220819153829.135562864@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jamal Hadi Salim commit 02799571714dc5dd6948824b9d080b44a295f695 upstream. Follows up on: https://lore.kernel.org/all/20220809170518.164662-1-cascardo@canonical.com/ handle of 0 implies from/to of universe realm which is not very sensible. Lets see what this patch will do: $sudo tc qdisc add dev $DEV root handle 1:0 prio //lets manufacture a way to insert handle of 0 $sudo tc filter add dev $DEV parent 1:0 protocol ip prio 100 \ route to 0 from 0 classid 1:10 action ok //gets rejected... Error: handle of 0 is not valid. We have an error talking to the kernel, -1 //lets create a legit entry.. sudo tc filter add dev $DEV parent 1:0 protocol ip prio 100 route from 10 \ classid 1:10 action ok //what did the kernel insert? $sudo tc filter ls dev $DEV parent 1:0 filter protocol ip pref 100 route chain 0 filter protocol ip pref 100 route chain 0 fh 0x000a8000 flowid 1:10 from 10 action order 1: gact action pass random type none pass val 0 index 1 ref 1 bind 1 //Lets try to replace that legit entry with a handle of 0 $ sudo tc filter replace dev $DEV parent 1:0 protocol ip prio 100 \ handle 0x000a8000 route to 0 from 0 classid 1:10 action drop Error: Replacing with handle of 0 is invalid. We have an error talking to the kernel, -1 And last, lets run Cascardo's POC: $ ./poc 0 0 -22 -22 -22 Signed-off-by: Jamal Hadi Salim Acked-by: Stephen Hemminger Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sched/cls_route.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/net/sched/cls_route.c +++ b/net/sched/cls_route.c @@ -424,6 +424,11 @@ static int route4_set_parms(struct net * return -EINVAL; } + if (!nhandle) { + NL_SET_ERR_MSG(extack, "Replacing with handle of 0 is invalid"); + return -EINVAL; + } + h1 = to_hash(nhandle); b = rtnl_dereference(head->table[h1]); if (!b) { @@ -477,6 +482,11 @@ static int route4_change(struct net *net int err; bool new = true; + if (!handle) { + NL_SET_ERR_MSG(extack, "Creating with handle of 0 is invalid"); + return -EINVAL; + } + if (opt == NULL) return handle ? -EINVAL : 0;