From: Greg Kroah-Hartman Date: Sun, 4 Dec 2022 16:01:35 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.9.335~45 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2602a681703a13f6dcbc42ed71ade1527edf8a56;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: revert-fbdev-fb_pm2fb-avoid-potential-divide-by-zero-error.patch --- diff --git a/queue-4.9/revert-fbdev-fb_pm2fb-avoid-potential-divide-by-zero-error.patch b/queue-4.9/revert-fbdev-fb_pm2fb-avoid-potential-divide-by-zero-error.patch new file mode 100644 index 00000000000..6ae8de3c96c --- /dev/null +++ b/queue-4.9/revert-fbdev-fb_pm2fb-avoid-potential-divide-by-zero-error.patch @@ -0,0 +1,34 @@ +From uli+cip@fpond.eu Sun Dec 4 16:59:13 2022 +From: Ulrich Hecht +Date: Fri, 2 Dec 2022 05:42:53 +0100 +Subject: Revert "fbdev: fb_pm2fb: Avoid potential divide by zero error" +To: stable@vger.kernel.org +Cc: sashal@kernel.org, gregkh@linuxfoundation.org, Ulrich Hecht +Message-ID: <20221202044253.516827-1-uli+cip@fpond.eu> + +From: Ulrich Hecht + +This reverts commit 6577e903a9e193ad70f2db92eba57c4f335afd1a. It's a +duplicate of a commit that is already in this tree +(0f1174f4972ea9fad6becf8881d71adca8e9ca91). + +Signed-off-by: Ulrich Hecht +Signed-off-by: Greg Kroah-Hartman +--- + drivers/video/fbdev/pm2fb.c | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/drivers/video/fbdev/pm2fb.c ++++ b/drivers/video/fbdev/pm2fb.c +@@ -619,11 +619,6 @@ static int pm2fb_check_var(struct fb_var + return -EINVAL; + } + +- if (!var->pixclock) { +- DPRINTK("pixclock is zero\n"); +- return -EINVAL; +- } +- + if (PICOS2KHZ(var->pixclock) > PM2_MAX_PIXCLOCK) { + DPRINTK("pixclock too high (%ldKHz)\n", + PICOS2KHZ(var->pixclock)); diff --git a/queue-4.9/series b/queue-4.9/series index 865d4235cef..347f6abd5f9 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -53,3 +53,4 @@ asoc-ops-fix-bounds-check-for-_sx-controls.patch pinctrl-single-fix-potential-division-by-zero.patch iommu-vt-d-fix-pci-device-refcount-leak-in-dmar_dev_.patch tcp-udp-fix-memory-leak-in-ipv6_renew_options.patch +revert-fbdev-fb_pm2fb-avoid-potential-divide-by-zero-error.patch