From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7FA5E33987; Sun, 1 Sep 2024 16:24:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725207882; cv=none; b=P51ySPxit/AqGVb9mfpxJMpVKWK487QvfmPxeSv1bpx3dPogk5Aia55KwL5Usx0QAtLJx+11M+DtuaCoRaGRXOOd/NIb4rHdiDE2LhTD7xFx5fZ/vja72ndv2eLiwDl3yGJAX4ryNraC3x5Tv3RSG6FQY/+TaaaCzuWIDBlz/vA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725207882; c=relaxed/simple; bh=+Ev+dviDJP/J437tFQAZ2Qr6GJZ7ZEcCgXLWJSQ0vT0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X4zSXotD0yHIvMR4lS4jbWMLXc+RpR0A8Z42KpKI7pLCDF6RdqWdzkW2bb4h8UD+T+niXZ4ismo26+PMJ0kzAlqGpTQu3rvQO6+XGUKgU0ndWZsZLS25G3/pcq1OwfequqneXIUlnJAs0pK/4PxnImKNmUrFDNUrL0Ff0pBt+ws= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=S7jFAPSf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="S7jFAPSf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AAA5AC4CEC3; Sun, 1 Sep 2024 16:24:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725207882; bh=+Ev+dviDJP/J437tFQAZ2Qr6GJZ7ZEcCgXLWJSQ0vT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S7jFAPSfkRUhSYSYSoUIwGoHtnmdedW+6zoQtY8vwcYvGBp0NbmrB8YpMXRJACIaI 0g/Fmf1l+SFAg/7BvZQN32hHq8qPHnfDc5XW3mVTgstFPU9Ywf0z6Z1jmgID5shRnI OETO9cEN6dkVLaXR0T0CM7AAHVrsTBDGjcaS5Ar0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+20dcf81733d43ddff661@syzkaller.appspotmail.com, Daniel Vetter , Javier Martinez Canillas , Thomas Zimmermann , Daniel Vetter Subject: [PATCH 4.19 98/98] drm/fb-helper: set x/yres_virtual in drm_fb_helper_check_var Date: Sun, 1 Sep 2024 18:17:08 +0200 Message-ID: <20240901160807.393310648@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240901160803.673617007@linuxfoundation.org> References: <20240901160803.673617007@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Vetter commit 1935f0deb6116dd785ea64d8035eab0ff441255b upstream. Drivers are supposed to fix this up if needed if they don't outright reject it. Uncovered by 6c11df58fd1a ("fbmem: Check virtual screen sizes in fb_set_var()"). Reported-by: syzbot+20dcf81733d43ddff661@syzkaller.appspotmail.com Link: https://syzkaller.appspot.com/bug?id=c5faf983bfa4a607de530cd3bb008888bf06cefc Cc: stable@vger.kernel.org # v5.4+ Cc: Daniel Vetter Cc: Javier Martinez Canillas Cc: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20230404194038.472803-1-daniel.vetter@ffwll.ch Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_fb_helper.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1713,6 +1713,9 @@ int drm_fb_helper_check_var(struct fb_va return -EINVAL; } + var->xres_virtual = fb->width; + var->yres_virtual = fb->height; + /* * Workaround for SDL 1.2, which is known to be setting all pixel format * fields values to zero in some cases. We treat this situation as a