Unverified Commit 9eeb96b0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7970 fbmon: prevent division by zero in fb_videomode_from_videomode() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Hui Tang <tanghui20@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MFTWQZ77TUW5STPQ5ILOAPMSTZHVQBBU/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9QGIW 
 
Link:https://gitee.com/openeuler/kernel/pulls/7970

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 7e7169f7 ba32744a

drivers/video/fbdev/core/fbmon.c

+4 −3
Original line number Diff line number Diff line
@@ -1311,7 +1311,7 @@ int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var, struct fb_inf 
int fb_videomode_from_videomode(const struct videomode *vm,

				struct fb_videomode *fbmode)

{

	unsigned int htotal, vtotal;

	unsigned int htotal, vtotal, total;



	fbmode->xres = vm->hactive;

	fbmode->left_margin = vm->hback_porch;
@@ -1344,8 +1344,9 @@ int fb_videomode_from_videomode(const struct videomode *vm, 
	vtotal = vm->vactive + vm->vfront_porch + vm->vback_porch +

		 vm->vsync_len;

	/* prevent division by zero */

	if (htotal && vtotal) {

		fbmode->refresh = vm->pixelclock / (htotal * vtotal);

	total = htotal * vtotal;

	if (total) {

		fbmode->refresh = vm->pixelclock / total;

	/* a mode must have htotal and vtotal != 0 or it is invalid */

	} else {

		fbmode->refresh = 0;