From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ABACC46467 for ; Mon, 16 Jan 2023 17:17:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234506AbjAPRRI (ORCPT ); Mon, 16 Jan 2023 12:17:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232301AbjAPRQd (ORCPT ); Mon, 16 Jan 2023 12:16:33 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F6B738B6D for ; Mon, 16 Jan 2023 08:57:11 -0800 (PST) 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 AE72CB81091 for ; Mon, 16 Jan 2023 16:57:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18AE2C433D2; Mon, 16 Jan 2023 16:57:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1673888229; bh=r+ErnnFDSWRKU1HeNnAJMyBzcmsj89HdihPsua9tMK4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z/w1EwvFH5ax5L/AIWYbbXbNc6iSENU1yXjyY0Ricpdyzl4BX/rOI6UK3pyaTcyb0 uROUOiPEYnF3hijVqyiQhZc3z+hv8zJRs8YpdizVZJJHGyVsAJU5ijcZ+CZk2TDjgv y/sLSTD2C0g6ssDcOZmPD1GY72XTt+3whVKngJcU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jamal Hadi Salim , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 449/521] net: sched: atm: dont intepret cls results when asked to drop Date: Mon, 16 Jan 2023 16:51:51 +0100 Message-Id: <20230116154907.211242816@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116154847.246743274@linuxfoundation.org> References: <20230116154847.246743274@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jamal Hadi Salim [ Upstream commit a2965c7be0522eaa18808684b7b82b248515511b ] If asked to drop a packet via TC_ACT_SHOT it is unsafe to assume res.class contains a valid pointer Fixes: b0188d4dbe5f ("[NET_SCHED]: sch_atm: Lindent") Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/sched/sch_atm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index 9a1bfa13a6cd..ff825f40ea04 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c @@ -394,10 +394,13 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch, result = tcf_classify(skb, fl, &res, true); if (result < 0) continue; + if (result == TC_ACT_SHOT) + goto done; + flow = (struct atm_flow_data *)res.class; if (!flow) flow = lookup_flow(sch, res.classid); - goto done; + goto drop; } } flow = NULL; -- 2.35.1