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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 40B59C433B4 for ; Fri, 16 Apr 2021 23:30:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E326F610E6 for ; Fri, 16 Apr 2021 23:30:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234723AbhDPXbS (ORCPT ); Fri, 16 Apr 2021 19:31:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229719AbhDPXbR (ORCPT ); Fri, 16 Apr 2021 19:31:17 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5958BC061574 for ; Fri, 16 Apr 2021 16:30:52 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id z22-20020a17090a0156b029014d4056663fso15434320pje.0 for ; Fri, 16 Apr 2021 16:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KL9elqXodDr0udWoBpJkxsclxcB1V/7V0mK2vTYFkKg=; b=TxehKJeRkdxMRR022A5VlhX9vbQUBrbEoh35u9fPYh0NA11rQmlJpdBLgr9X1RZURc aUBpAKfyz+SM+dRevprZzCtRaVHrS0VlueU1L0zVYfMj/w3YnuxhGvCiXOQYt+aaqT8o qtMTkAgx92Gvww/SX00QpbsQDtXZCaOPLdmZ5SSdRg4iUQ/Gyk5M1irX/+iGsJduKAmx p281wPYoeblj9VxCS7kOdYJEqAWGeJ0vXlWS4bBv9X+VkhBTwVRhg8sOzTogRMuH7cNB ezg/JWHz74Ip8ut0Av5dB/6E/OTIYpGOHTRa5Ixv0baAjSzytL0RSAFCz817ipA/gVF3 7Qug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KL9elqXodDr0udWoBpJkxsclxcB1V/7V0mK2vTYFkKg=; b=K21W+NFiXsNsKYxcmQf/K29S5gkFlb8Ol3TvWsHht1QkqGRy8SNvGW9dCmwzwjgeWU sgwDQwODdy0RKUpAbZC6STyy77M93iMmMw1gFzU/t5IGzMK6nxQtECq2/fsrfsVByPAF tSuiUcOuRBudqvQg5MNoMJTUa7872y0M7sYY0eccBu+bd5Fp2VenQQFoniIJ0Qw0WX9W gq4SzSL7lAZHq5KtWP49XGss/5Emypsb5PU9KnyoEYl+Bz2uaQx08c8FIYq2uFfW7rRq lHuFYBYtcXXoHMs1Jc+5sulYI7VOYs4EWZXrRgQYSJp7TASf5ZlCk4Y0ISwDQoqb+R/V R9sQ== X-Gm-Message-State: AOAM533HpIjLxCUUQOGo42MX49UcjGH/jytlqngaP5m9bTa07n6b2mMs x4zxtwkB89hpZE4W3GTCtLk= X-Google-Smtp-Source: ABdhPJyJr11puVNcGKCDunxKO1ECwif9HuVTgFwrPkdlRTwQxj7RvHN9dJSW5L8+0JXmlwTkEr5YJA== X-Received: by 2002:a17:90a:c982:: with SMTP id w2mr12581135pjt.35.1618615851925; Fri, 16 Apr 2021 16:30:51 -0700 (PDT) Received: from nuc.wg.ducheng.me ([202.133.196.154]) by smtp.gmail.com with ESMTPSA id o127sm5858489pfd.147.2021.04.16.16.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 16:30:51 -0700 (PDT) From: Du Cheng To: Jamal Hadi Salim , Cong Wang , Jiri Pirko Cc: netdev@vger.kernel.org, Shuah Khan , Greg Kroah-Hartman , eric.dumazet@gmail.com, Du Cheng , syzbot+d50710fd0873a9c6b40c@syzkaller.appspotmail.com Subject: [PATCH v4] net: sched: tapr: prevent cycle_time == 0 in parse_taprio_schedule Date: Sat, 17 Apr 2021 07:30:46 +0800 Message-Id: <20210416233046.12399-1-ducheng2@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is a reproducible sequence from the userland that will trigger a WARN_ON() condition in taprio_get_start_time, which causes kernel to panic if configured as "panic_on_warn". Catch this condition in parse_taprio_schedule to prevent this condition. Reported as bug on syzkaller: https://syzkaller.appspot.com/bug?extid=d50710fd0873a9c6b40c Reported-by: syzbot+d50710fd0873a9c6b40c@syzkaller.appspotmail.com Signed-off-by: Du Cheng --- changelog v1: Discussion https://lore.kernel.org/netdev/YHfwUmFODUHx8G5W@carbon/T/ v2: fix typo https://lore.kernel.org/netdev/20210415075953.83508-2-ducheng2@gmail.com/T/ v3: catch the condition in parse_taprio_schedule instead https://lore.kernel.org/netdev/CAM_iQpWs3Z55=y0-=PJT6xZMv+Hw9JGPLFXmbr+35+70DAYsOQ@mail.gmail.com/T/ v4: add extack net/sched/sch_taprio.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c index 8287894541e3..909c798b7403 100644 --- a/net/sched/sch_taprio.c +++ b/net/sched/sch_taprio.c @@ -901,6 +901,12 @@ static int parse_taprio_schedule(struct taprio_sched *q, struct nlattr **tb, list_for_each_entry(entry, &new->entries, list) cycle = ktime_add_ns(cycle, entry->interval); + + if (!cycle) { + NL_SET_ERR_MSG(extack, "'cycle_time' can never be 0"); + return -EINVAL; + } + new->cycle_time = cycle; } -- 2.30.2