OSDN Git Service

x86/sysfb: Fix check for bad VRAM size
authorArvind Sankar <nivedita@alum.mit.edu>
Tue, 7 Jan 2020 23:04:10 +0000 (18:04 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2020 07:34:38 +0000 (08:34 +0100)
commit0ef2661de7a5ef0dd3a70a89b796d2d13fdfbc3e
treee1e5ea46a830733cddeaae4e94589d89218e8024
parent8d8a471188d10ff24442b17358815fa01e470ea5
x86/sysfb: Fix check for bad VRAM size

[ Upstream commit dacc9092336be20b01642afe1a51720b31f60369 ]

When checking whether the reported lfb_size makes sense, the height
* stride result is page-aligned before seeing whether it exceeds the
reported size.

This doesn't work if height * stride is not an exact number of pages.
For example, as reported in the kernel bugzilla below, an 800x600x32 EFI
framebuffer gets skipped because of this.

Move the PAGE_ALIGN to after the check vs size.

Reported-by: Christopher Head <chead@chead.ca>
Tested-by: Christopher Head <chead@chead.ca>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=206051
Link: https://lkml.kernel.org/r/20200107230410.2291947-1-nivedita@alum.mit.edu
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/kernel/sysfb_simplefb.c