Message ID | 20220221084917.578228736@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <stable-owner@kernel.org> 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 9B7BDC433EF for <stable@archiver.kernel.org>; Mon, 21 Feb 2022 09:08:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347725AbiBUJIb (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 21 Feb 2022 04:08:31 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:48328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347732AbiBUJHl (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 21 Feb 2022 04:07:41 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 094941093; Mon, 21 Feb 2022 01:00:08 -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 dfw.source.kernel.org (Postfix) with ESMTPS id D012B6112C; Mon, 21 Feb 2022 09:00:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8DCAC340E9; Mon, 21 Feb 2022 09:00:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645434007; bh=Afd1ohPIfw0EaOJNQmi0C4AyuskArmlBewI3ENt0m08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KeEoPG3KFrqiiwYpx3cwuMG78x38naPFy2o1aBJl2ets99Dw/QZSk/DtoKoi4GZbI USH79ZIfVmuO1O+V3quzwYnm6tXDoa+HDPz0NTN1S41sOmP3nA9WEtHgtVkBgpZ0Ld sJgyA+LiTwvDLLXYT5nggpCkAxExdTWCoLZkaOpM= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Eric Dumazet <edumazet@google.com>, Jamal Hadi Salim <jhs@mojatatu.com>, Cong Wang <xiyou.wangcong@gmail.com>, Jiri Pirko <jiri@resnulli.us>, syzbot <syzkaller@googlegroups.com>, Jakub Kicinski <kuba@kernel.org> Subject: [PATCH 5.4 61/80] net: sched: limit TC_ACT_REPEAT loops Date: Mon, 21 Feb 2022 09:49:41 +0100 Message-Id: <20220221084917.578228736@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084915.554151737@linuxfoundation.org> References: <20220221084915.554151737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -652,15 +652,24 @@ int tcf_action_exec(struct sk_buff *skb, restart_act_graph: for (i = 0; i < nr_actions; i++) { const struct tc_action *a = actions[i]; + int repeat_ttl; if (jmp_prgcnt > 0) { jmp_prgcnt -= 1; continue; } + + repeat_ttl = 32; repeat: ret = a->ops->act(skb, a, res); - if (ret == TC_ACT_REPEAT) - goto repeat; /* we need a ttl - JHS */ + + if (unlikely(ret == TC_ACT_REPEAT)) { + if (--repeat_ttl != 0) + goto repeat; + /* suspicious opcode, stop pipeline */ + net_warn_ratelimited("TC_ACT_REPEAT abuse ?\n"); + return TC_ACT_OK; + } if (TC_ACT_EXT_CMP(ret, TC_ACT_JUMP)) { jmp_prgcnt = ret & TCA_ACT_MAX_PRIO_MASK;