Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp967362pxb; Wed, 6 Apr 2022 05:34:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwHTr9WWi41kjVj0hojPo4i/H6I2i6pUigQs67Oo1UCLhCVGCY8505CTym2w06QZOk9iuA X-Received: by 2002:a17:902:da90:b0:154:4737:a3f with SMTP id j16-20020a170902da9000b0015447370a3fmr8398906plx.73.1649248445880; Wed, 06 Apr 2022 05:34:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649248445; cv=none; d=google.com; s=arc-20160816; b=akr27tZyji/Zmxi/tq7MlGjkpBxEh8gvJCSGN1e5z+oI52/1upAOiGBNa6sr8YR+rx hj4Oi3nhW5WnV7ijQPOubQcgXmTYpbRFSi3XxF7EKu5diopENel3zhFRHPDrNSrSkLTm AI/MxndTFY4EHZMJgz7FMaZc5gvfgtQVlng4dnQPI4TmNLgSyxcn+gDQArBviQmUv+kk bBZeGFWvyVMiRhNkIhn2T89QS3Y7AwBKEKHbcNjDDWKN0tGvyaUaBbFwqMBVPJsJgkuR wHoSEqLjfQHRbOGOCERcEbo5c1G5YgCn1kkpg4k6ETVhpQWPfdZoet33KbFcURHLqEBS 1+lw== 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=ViZwZ99ad5kH0027xP/KZdB7Uy55hxfyf8MrpltQV8Y=; b=c5wRrjzsDPfDuDRV+c7yOpYkyQuu3KD4K9yzjZEMgWckTSyq6+wx7Va8MD2wfXlHUV 3PUGzKPOGGe7gnjNGJHs+x/ob/HBwqUMHBGPU1rvG3jQbG4ii50L9eNk+syCb0Bpsn7J lYU3p65cpCSCCKIcLgv+zujuWf32hghVDC+O7Vq/jGbRK0dXBmRVj5Eeyk019tGpUZ39 Dzn6/1oJ30H3S2TIny2R+yjZaPxD/9/QjkYNPrb8htJHUaYz1GC+8Oq6MQr3YXZMssKL 0yI6I3vLmXMmDcsHSOq3i50kaDEtqqnb6K6Q1VmGzzgnb/L0lNdn4d5rNGVRx1DQP08Y 55EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0O71vywx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id e5-20020a17090301c500b00155f0855954si15887517plh.524.2022.04.06.05.34.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 05:34:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0O71vywx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 103CA479395; Wed, 6 Apr 2022 02:04:12 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1839852AbiDFBGE (ORCPT + 99 others); Tue, 5 Apr 2022 21:06:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243758AbiDEKhl (ORCPT ); Tue, 5 Apr 2022 06:37:41 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6E5955BC7; Tue, 5 Apr 2022 03:23:04 -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 sin.source.kernel.org (Postfix) with ESMTPS id 1744ACE1B5F; Tue, 5 Apr 2022 10:23:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35650C385A0; Tue, 5 Apr 2022 10:23:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649154181; bh=CNRBQopooIEtsueaUrSSUgiLsrLEPIgLmSdYpJLQ7Ls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0O71vywxRhb0AkByryTCkpHrngY7PWAPh8vU9pZ6Z4yckZeVd4QZ+/BhQ4lvZ2Z6l lRWiOZnP37vfByhLWQ+B489ipNdk4JjVNS4o09oEqPRkfRzveIyKmvueY/jvCNNAt3 uiB2PvxFUph9g0rg4hJZiEVXv2s8I2ZHKhi9Pgdg= 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.10 485/599] video: fbdev: cirrusfb: check pixclock to avoid divide by zero Date: Tue, 5 Apr 2022 09:32:59 +0200 Message-Id: <20220405070313.261277495@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070258.802373272@linuxfoundation.org> References: <20220405070258.802373272@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 15a9ee7cd734..b4980bc2985e 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