From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F530A93F for ; Tue, 10 Jan 2023 18:09:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA559C433D2; Tue, 10 Jan 2023 18:09:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1673374191; bh=y2ruuQ1KIS44FqTVqnOypcyXNVLb0zfFNoiNYtUOJ88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BHu0EdkQhjXDk8lOE1yZ/PBgTtqU7rpofDalok3cRqqX8vPw1CKv3kAL1C0LvqA4B UCChfZJU3T2dPpzZ8IQ0nsSpFSkqTvOn8WTv+pYQ++A9qLraoic1BTh1Fdb9lhhyhR ygnGWDzSU9WRBBLbc1OmLdToxk3iyhE1t/rvd41o= 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 6.0 080/148] net: sched: atm: dont intepret cls results when asked to drop Date: Tue, 10 Jan 2023 19:03:04 +0100 Message-Id: <20230110180019.745738953@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230110180017.145591678@linuxfoundation.org> References: <20230110180017.145591678@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 816fd0d7ba38..28e1897e0da7 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c @@ -397,10 +397,13 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch, result = tcf_classify(skb, NULL, 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