Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3412425rwa; Tue, 23 Aug 2022 04:28:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR7Y4FEh5WOVKHayJJufE+ItGj9mGJMebIh1KtPae+by58fxt+JUfOxjEHKLaIAuhNJI7+dQ X-Received: by 2002:a63:8843:0:b0:42a:d28a:ce8f with SMTP id l64-20020a638843000000b0042ad28ace8fmr4535254pgd.5.1661254118842; Tue, 23 Aug 2022 04:28:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661254118; cv=none; d=google.com; s=arc-20160816; b=zkQzysPzr6rQcXM57NdnBGtoMfSStk+xSv5XlrSam7PsHuOti02XzeGS9Kh9J8DfgK pNiCDnU2GH2iKLLsLRggYygkqFF/bzky0n6K8SLYPbT0akkK9o6o2UIkxuKq7nXS+8WX DuBLZdr680SwIHvX8P6Z6KderTen8YEdU9PhlEkiFk+pWQgojkHVVx55imbgoGBJ1/N1 OW/KUlItzEOcAb11XRoaspFGmrF7sjgKCPQD9QljwwQX2A6k9GVi0w5rkwtHYi560Rbj 8XwWEBbX1sa0/WBHH12T5CkOnMatJdpXmPQGd6MQYjF29fXC3x0qSpfgfnLquLLn7MP0 d6dw== 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=/E0C9u41m/T8jKuw9aNGoFM3Zyt+slnJplVEQEA4v+U=; b=UHFe/2Jwng/4vDyFeYnkoX4A/X6WOn7CnMuu7LrwpQPONdqBmG7dW4jyddR6SIwzoP HkIquu+XK9HesDj1HI+T13boZqOUylam7sibHLqDmSx4WPtyUvwo33//8u0AJv8o0Hz0 hJ605BMtICs/+EgQPNuF5R7z3EhxLNtQkZMGqAtKFeiwEGrhQjpYNFrNZ+I/gRvIojFx iC15i2zZU5wPeLJIF6hT4zf7PC8y1m8IAHwvSx3LzPZRap+WNFOWYA1Lsw0OhKarvYs+ JLSbUtw7abYJHGdO0FTUaABjjxOoQDyng8VraE+GhXrfa3eyEZ9XrynAe7zsqXEzP4Kd qRbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vtzKxhBR; 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 y14-20020a17090322ce00b0016eec129304si16713074plg.259.2022.08.23.04.28.27; Tue, 23 Aug 2022 04:28:38 -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=vtzKxhBR; 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 S1353426AbiHWKL2 (ORCPT + 99 others); Tue, 23 Aug 2022 06:11:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351993AbiHWKEQ (ORCPT ); Tue, 23 Aug 2022 06:04:16 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDC947CAAE; Tue, 23 Aug 2022 01:51:21 -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 CF892B81C39; Tue, 23 Aug 2022 08:51:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17DC1C433C1; Tue, 23 Aug 2022 08:51:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661244678; bh=Jy32Zh/HlrBFPGofS56r9APlpigQ81Lcmqyu53Rlg4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vtzKxhBRTdrMDJnoSobxXUkkIxisa62IuO1HK50dIZ9l2LHXUdCplzVhS6Vgio1t8 rOFkXeEJQ9jCZ6iO6/nbxppFfE68RifUsfDf4bBECLyry0URSJZAfmjijPwR45UMIg 2QiZN7IwS96mO39tdUC0xOHigdoCfVANqLUbTVro= 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 4.14 174/229] net_sched: cls_route: disallow handle of 0 Date: Tue, 23 Aug 2022 10:25:35 +0200 Message-Id: <20220823080059.835003991@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080053.202747790@linuxfoundation.org> References: <20220823080053.202747790@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 | 6 ++++++ 1 file changed, 6 insertions(+) --- a/net/sched/cls_route.c +++ b/net/sched/cls_route.c @@ -431,6 +431,9 @@ static int route4_set_parms(struct net * return -EINVAL; } + if (!nhandle) + return -EINVAL; + h1 = to_hash(nhandle); b = rtnl_dereference(head->table[h1]); if (!b) { @@ -483,6 +486,9 @@ static int route4_change(struct net *net int err; bool new = true; + if (!handle) + return -EINVAL; + if (opt == NULL) return handle ? -EINVAL : 0;