Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp641274pxb; Tue, 5 Apr 2022 17:00:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzMlhivFORC/ZvjQgr47BTh4A1uc+FUy9GmAjlL3aSyKfbdi3cWhMCQHvPuAB7KIPvfruix X-Received: by 2002:a65:654f:0:b0:378:b8f6:ebe4 with SMTP id a15-20020a65654f000000b00378b8f6ebe4mr4792832pgw.399.1649203251828; Tue, 05 Apr 2022 17:00:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649203251; cv=none; d=google.com; s=arc-20160816; b=OGxoXohtF/3CGAkLi/OhdxcCqzSMBrn9Tyar/yCv0JWuhGs/MBG7hikhUYNU+rutas p8q5h/TqMxdI3Re2YyZ9WR5sbPuoKb8H3WbYont38RwwHRz3HgeSbMLZNreVJDtzQowe C8VWH+5mNUpqFCbrEQxcsujClN8x6UpRII3G7w62m+OvMS2kSxEcGAy1h4bWS1HfPOEg IwfnJ038lKIGUusiHKAJYYuclLtI+l9qvQsw/IjbAuzxU/LCTJQYis3N8kTT8oNtFHTN bBepWqt3WtNkMKRiJYct308zZeuv9aQjVaLO4QhUWQyDCdwGCv5e4Ts/Z7OW79hAqx4d tt+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gRLbehzOhySGBSt8zdEp+hreRAFrUvMkLBR6ptESSwA=; b=omKrj79/W7qdWBogLN08gQgK2JL4Pd1Qsfya9oX9qhWSX8pEVqhvXMeYLA77Sq691i eIsyqAgw8auIrEnbeFr+RH/zwl9D3azYzNjSe5/DbPvt8mhL0iOSIXm5is2dUsCO5/HQ cO5kQVkFu0uLyADJ3TWBzU8IOvuFWQOrZgtMjoFhQhxj/gKUeAK0UidJxt8khR1pE/eU Dj7cUlkfasT7Uo4WwB0/R7BWP0CJxsQvI9GChG9Cujh9k8JB1KwdG/F+Y0xk0tOKGGEA LVkqrAQTZtjhi1zSsGbT9QuQTzvqSamtbJ9ZEvmQe8c9cMkUx1/eZ0MOaaIOSmTdi6Qq L83A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lnnclpOi; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id e1-20020a631e01000000b003816043f0ffsi14297729pge.756.2022.04.05.17.00.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 17:00:51 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lnnclpOi; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1763C28E4AD; Tue, 5 Apr 2022 16:46:51 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239850AbiDENzI (ORCPT + 99 others); Tue, 5 Apr 2022 09:55:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344792AbiDEJVN (ORCPT ); Tue, 5 Apr 2022 05:21:13 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE56F255A9; Tue, 5 Apr 2022 02:08:45 -0700 (PDT) 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 37E586157B; Tue, 5 Apr 2022 09:08:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40066C385A3; Tue, 5 Apr 2022 09:08:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649149724; bh=xuNZMXifvmTGhpPgK2BkPkaKp82sCR/h9SV2ylyFzog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lnnclpOiR+iIf1J1GQ1uD554jpGtSBLH98CdRkoeouhb4H17b7sWLj1ly9Ol8JbUH sR/C+umwvKmcvIMn8v+qcsu7ehqYgYh2fNQa2LMB9hQE3+ls4jJGdlz1gaI2n2GF+o 5vrWrc8nfUrhX2+dVRLGR9bsgjQTCc7apQg7itts= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, George Kennedy , Geert Uytterhoeven , Helge Deller , Sasha Levin Subject: [PATCH 5.16 0818/1017] video: fbdev: cirrusfb: check pixclock to avoid divide by zero Date: Tue, 5 Apr 2022 09:28:51 +0200 Message-Id: <20220405070418.529823507@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070354.155796697@linuxfoundation.org> References: <20220405070354.155796697@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: George Kennedy [ Upstream commit 5c6f402bdcf9e7239c6bc7087eda71ac99b31379 ] Do a sanity check on pixclock value to avoid divide by zero. If the pixclock value is zero, the cirrusfb driver will round up pixclock to get the derived frequency as close to maxclock as possible. Syzkaller reported a divide error in cirrusfb_check_pixclock. divide error: 0000 [#1] SMP KASAN PTI CPU: 0 PID: 14938 Comm: cirrusfb_test Not tainted 5.15.0-rc6 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2 RIP: 0010:cirrusfb_check_var+0x6f1/0x1260 Call Trace: fb_set_var+0x398/0xf90 do_fb_ioctl+0x4b8/0x6f0 fb_ioctl+0xeb/0x130 __x64_sys_ioctl+0x19d/0x220 do_syscall_64+0x3a/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xae Signed-off-by: George Kennedy Reviewed-by: Geert Uytterhoeven Signed-off-by: Helge Deller Signed-off-by: Sasha Levin --- drivers/video/fbdev/cirrusfb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/video/fbdev/cirrusfb.c b/drivers/video/fbdev/cirrusfb.c index 93802abbbc72..3d47c347b897 100644 --- a/drivers/video/fbdev/cirrusfb.c +++ b/drivers/video/fbdev/cirrusfb.c @@ -469,7 +469,7 @@ static int cirrusfb_check_mclk(struct fb_info *info, long freq) return 0; } -static int cirrusfb_check_pixclock(const struct fb_var_screeninfo *var, +static int cirrusfb_check_pixclock(struct fb_var_screeninfo *var, struct fb_info *info) { long freq; @@ -478,9 +478,7 @@ static int cirrusfb_check_pixclock(const struct fb_var_screeninfo *var, unsigned maxclockidx = var->bits_per_pixel >> 3; /* convert from ps to kHz */ - freq = PICOS2KHZ(var->pixclock); - - dev_dbg(info->device, "desired pixclock: %ld kHz\n", freq); + freq = PICOS2KHZ(var->pixclock ? : 1); maxclock = cirrusfb_board_info[cinfo->btype].maxclock[maxclockidx]; cinfo->multiplexing = 0; @@ -488,11 +486,13 @@ static int cirrusfb_check_pixclock(const struct fb_var_screeninfo *var, /* If the frequency is greater than we can support, we might be able * to use multiplexing for the video mode */ if (freq > maxclock) { - dev_err(info->device, - "Frequency greater than maxclock (%ld kHz)\n", - maxclock); - return -EINVAL; + var->pixclock = KHZ2PICOS(maxclock); + + while ((freq = PICOS2KHZ(var->pixclock)) > maxclock) + var->pixclock++; } + dev_dbg(info->device, "desired pixclock: %ld kHz\n", freq); + /* * Additional constraint: 8bpp uses DAC clock doubling to allow maximum * pixel clock -- 2.34.1