Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp223988pxb; Mon, 13 Sep 2021 17:36:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylM3jaUAzyTxLvoRJkGcS84UmQmoXfPz4N5k5qGN/gDJ4fPe7mOEsSnnj266pGVeSpZeqQ X-Received: by 2002:a17:906:4cc1:: with SMTP id q1mr15148447ejt.415.1631579804809; Mon, 13 Sep 2021 17:36:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631579804; cv=none; d=google.com; s=arc-20160816; b=Nr88qzztLwUZmcunVnKo1f8tDBlWFd9u08a0guqC4clDIWgR3mWdArgeEjiUokCm0r 6tLdj6towvk6qecoYVdkRh/vBmEcM/Bdv0jdcaaiHwphGmeY7BhAjyCU6alMa6igOgIT cXaLiS9Nkf/1aYywt74g0PLUsEp3smn1w73zvwN/H+jO9RWfasaIx2Wvcn5k0zSrsN3R QMt2HQvHQorAi0WSP8bu5KlTbVbN6fU2hqh83XNYOxR20PtfxZrgIskWHNf30jOZ23Kx Jm/TmhUOMH1A9Kkf19SEThGj1NnZnIZcnYRhUeixtUfIEBYrcrPVk4Vsqrm7qqpl3uZH 7J5w== 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=FNfF0vj/bkHTJGzxYtLvKR73eljfAUbQ6Bxb0wXZTcw=; b=ocPRVwvcwjGvJWsQ7Nqs5ZPieu/1zdoIp7JlsmYEHme6QPjVTNHsrgcjfAYXasvYJ9 MUe9lvyod65Ok5dLANi/LdJYFlXU15FVtYF1HgwM6CvQ9i8EwgnunAdf20hXtOVoCjUf /H0DWeW6Ts0JoskqrOW3mGD+GqCIMmFhWxOSYdzvfS5/3j/rPV0qX6OvhAmbUFO6totW utQboehxk9j00E3oifMIbmA1lasJN5KC3NSsMBHJ8aVK2crYI6ddCy/QaSoxxaSxlxWc vxw1SPhLrrXPhbT34m9rvwu+TnMQVMA+nOwt8KIgUqBBewci/wWLL4VkF047xUF3h544 +YiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hbOElNVo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ji22si9405426ejc.361.2021.09.13.17.36.21; Mon, 13 Sep 2021 17:36:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hbOElNVo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241929AbhIMOvW (ORCPT + 99 others); Mon, 13 Sep 2021 10:51:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:60770 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346202AbhIMOqJ (ORCPT ); Mon, 13 Sep 2021 10:46:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EF21861A03; Mon, 13 Sep 2021 13:58:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631541517; bh=/g+trBMoQm5LAjyoHsSB+HdF4wGta3FusR7hgMEIbGE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hbOElNVoNnrBUDm+FaCX/BA8doerYSROr1OCLQgtxj+/nGm8Y2BGzB0Vm2H/QFbkV T1rDxglrIeGHUjIGGAGAf8wkcg2RUmc3V64k4NjHPUZoyWpxGB140hradXzoTrzarq N4jkdmsxUWKhjUFX7EnumqjA1autc4kyWKAq6kkc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot , Tetsuo Handa , Geert Uytterhoeven , Daniel Vetter , Randy Dunlap Subject: [PATCH 5.14 328/334] fbmem: dont allow too huge resolutions Date: Mon, 13 Sep 2021 15:16:22 +0200 Message-Id: <20210913131124.529193949@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131113.390368911@linuxfoundation.org> References: <20210913131113.390368911@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tetsuo Handa commit 8c28051cdcbe9dfcec6bd0a4709d67a09df6edae upstream. syzbot is reporting page fault at vga16fb_fillrect() [1], for vga16fb_check_var() is failing to detect multiplication overflow. if (vxres * vyres > maxmem) { vyres = maxmem / vxres; if (vyres < yres) return -ENOMEM; } Since no module would accept too huge resolutions where multiplication overflow happens, let's reject in the common path. Link: https://syzkaller.appspot.com/bug?extid=04168c8063cfdde1db5e [1] Reported-by: syzbot Debugged-by: Randy Dunlap Signed-off-by: Tetsuo Handa Reviewed-by: Geert Uytterhoeven Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/185175d6-227a-7b55-433d-b070929b262c@i-love.sakura.ne.jp Signed-off-by: Greg Kroah-Hartman --- drivers/video/fbdev/core/fbmem.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -962,6 +962,7 @@ fb_set_var(struct fb_info *info, struct struct fb_var_screeninfo old_var; struct fb_videomode mode; struct fb_event event; + u32 unused; if (var->activate & FB_ACTIVATE_INV_MODE) { struct fb_videomode mode1, mode2; @@ -1008,6 +1009,11 @@ fb_set_var(struct fb_info *info, struct if (var->xres < 8 || var->yres < 8) return -EINVAL; + /* Too huge resolution causes multiplication overflow. */ + if (check_mul_overflow(var->xres, var->yres, &unused) || + check_mul_overflow(var->xres_virtual, var->yres_virtual, &unused)) + return -EINVAL; + ret = info->fbops->fb_check_var(var, info); if (ret)