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 X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3A4CC3A5A6 for ; Thu, 19 Sep 2019 22:22:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96D9A2196E for ; Thu, 19 Sep 2019 22:22:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931778; bh=obZJGybuOGuvb7rE0KaEn9xYdYJYnDET0Af657/SRr0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=x5e6e4gS51Sq+axMwr+cuT7mD4CINKMPzXItIZE5zIunE+H07Z/z4QZVF4xE+H3Ry uBdTZw7Y0/p/a2AZNCr81VEYFnNScsR/1ZTNLFOgGFfJ9vRa1ATrbC6T9LiT9LNuxV GjVWlc+y4aWVFDz9IYYI5nliPG6bBorqgAKMoAA0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394129AbfISWW5 (ORCPT ); Thu, 19 Sep 2019 18:22:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:38186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406935AbfISWWx (ORCPT ); Thu, 19 Sep 2019 18:22:53 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8706E21920; Thu, 19 Sep 2019 22:22:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931773; bh=obZJGybuOGuvb7rE0KaEn9xYdYJYnDET0Af657/SRr0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ncrW4Jc+3+RnAdeo/qgJVWWu3uh102UK3ZEcPKITX7WwJEzbGn2ZMyRN6CAQ8qZcY ziXmIiFmMLJRcCDSbHaZBkbhQDKF27XaUrU4O5VCERGdRuiz5j/8/66ODMmEq+c6WX 9TCXQSW+eSnwBWvH9E6ODngknxeT2G9vcrgvG/ZE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+bc6297c11f19ee807dc2@syzkaller.appspotmail.com, syzbot+041483004a7f45f1f20a@syzkaller.appspotmail.com, syzbot+55be5f513bed37fc4367@syzkaller.appspotmail.com, Jamal Hadi Salim , Jiri Pirko , Terry Lam , Cong Wang , "David S. Miller" Subject: [PATCH 4.4 06/56] sch_hhf: ensure quantum and hhf_non_hh_weight are non-zero Date: Fri, 20 Sep 2019 00:03:47 +0200 Message-Id: <20190919214747.024056988@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214742.483643642@linuxfoundation.org> References: <20190919214742.483643642@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Cong Wang [ Upstream commit d4d6ec6dac07f263f06d847d6f732d6855522845 ] In case of TCA_HHF_NON_HH_WEIGHT or TCA_HHF_QUANTUM is zero, it would make no progress inside the loop in hhf_dequeue() thus kernel would get stuck. Fix this by checking this corner case in hhf_change(). Fixes: 10239edf86f1 ("net-qdisc-hhf: Heavy-Hitter Filter (HHF) qdisc") Reported-by: syzbot+bc6297c11f19ee807dc2@syzkaller.appspotmail.com Reported-by: syzbot+041483004a7f45f1f20a@syzkaller.appspotmail.com Reported-by: syzbot+55be5f513bed37fc4367@syzkaller.appspotmail.com Cc: Jamal Hadi Salim Cc: Jiri Pirko Cc: Terry Lam Signed-off-by: Cong Wang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sched/sch_hhf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/sched/sch_hhf.c +++ b/net/sched/sch_hhf.c @@ -552,7 +552,7 @@ static int hhf_change(struct Qdisc *sch, new_hhf_non_hh_weight = nla_get_u32(tb[TCA_HHF_NON_HH_WEIGHT]); non_hh_quantum = (u64)new_quantum * new_hhf_non_hh_weight; - if (non_hh_quantum > INT_MAX) + if (non_hh_quantum == 0 || non_hh_quantum > INT_MAX) return -EINVAL; sch_tree_lock(sch);