Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp985219pxb; Wed, 6 Apr 2022 06:03:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6uKyaZcjWHO0ghSdizBeS2wkl70BrKV0+jJHBCrs38c0DpeJSW/8xPWZnEBJK1IUBJglk X-Received: by 2002:a02:a58e:0:b0:321:6691:ee73 with SMTP id b14-20020a02a58e000000b003216691ee73mr4710794jam.217.1649250237229; Wed, 06 Apr 2022 06:03:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649250237; cv=none; d=google.com; s=arc-20160816; b=nsU6Jk+RonbMiDuENlquMZaeikXt6X1w3UpvBXjHBeIWpuzus6T9b/WM4mhZBGIuOY bHRpwC7DSH7T94j2LfNJmHUDQGk9bs/gMWjDMvV/qXp3rWXDz/cP8fX6zRCqHG7F+CDE qzE2Lq++tm8sVZcV67oxt9pNS/Mri5zZQO9Zt/OeFf1RQT9r3why8T4k5VT3a7JLr/up L3sLt+72rV36iHxojewMHwQ/fydDfCCjl11BgDMgNNty2MVuJj+U3+Vgh/k11UQtXSqQ 2LkXKlvZx3cYAZTQvtI7lLN2b2D3E+/++f/0+aP8YEZShDAxs24CDAmgwFBqGb1lZLPW jVtg== 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=go0yRAMkz/2xZzwKPSGfK+7D2Xo/8B8sxTjoemRt/aJ/CUcn3Xb7cyZrf6nBDD38Xw hMfDaNXMS9p9WWvcNDAeJTl4AhfexKdfEnF4KbGWigKv5P/yB9dKjYs29zkvGSrW8hoP 42rBJyxLF9BxZt7KO8LRCnQt8qjXWVHA5Zdnzua/auy6sKJsjNR6KXK9/EfPr6Hf4MlL UX6B+ff8Me1AlBWwIDrVQMfurvWZSQU7Y4aTWRlryzPG1bdrtsXcKFiYihKkawOaQBAq 486X5doLd2/DO4kUJTPb77Z9mCwWNtC3GMOaWJrsctrnjB1vzC+d7USiVgfgPY8pEG/u hyag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=t1s0Yh3U; 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 y7-20020a92d807000000b002c7c7bfb686si5038666ilm.36.2022.04.06.06.03.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 06:03:57 -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=t1s0Yh3U; 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 6906F666AF4; Wed, 6 Apr 2022 03:24:21 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351322AbiDEUjK (ORCPT + 99 others); Tue, 5 Apr 2022 16:39:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351915AbiDEKD3 (ORCPT ); Tue, 5 Apr 2022 06:03:29 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28101972DB; Tue, 5 Apr 2022 02:52:33 -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 ams.source.kernel.org (Postfix) with ESMTPS id 63BE9B81B97; Tue, 5 Apr 2022 09:52:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9F1FC385A6; Tue, 5 Apr 2022 09:52:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649152340; bh=xuNZMXifvmTGhpPgK2BkPkaKp82sCR/h9SV2ylyFzog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t1s0Yh3UbcB+5mPLIjUwL5XuptyawVmLuIxTMmFZuNEnqsaLcwclPFhGYnIMNjzf9 dhbT9UAPO8bIzKluUr1iR4X8FzNfhHO+JocXzfGbn2mVzk/twdNbJGSA86pBNacP3K R8yL3nBvFPRi1/UVyjJvjGm8cQp825gk850VqN0o= 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.15 739/913] video: fbdev: cirrusfb: check pixclock to avoid divide by zero Date: Tue, 5 Apr 2022 09:30:01 +0200 Message-Id: <20220405070401.986511973@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070339.801210740@linuxfoundation.org> References: <20220405070339.801210740@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