Commit 8cc97541 authored Mar 01, 2024 by Aleksandr Burakov Committed by sanglipeng1 Aug 23, 2024

fbdev: viafb: fix typo in hw_bitblt_1 and hw_bitblt_2

stable inclusion
from stable-v5.10.215
commit 19536fe42003c57aaad848235e3b5e15ebebcada
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAJJ2D

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=19536fe42003c57aaad848235e3b5e15ebebcada



--------------------------------

[ Upstream commit bc87bb342f106a0402186bcb588fcbe945dced4b ]

There are some actions with value 'tmp' but 'dst_addr' is checked instead.
It is obvious that a copy-paste error was made here and the value
of variable 'tmp' should be checked here.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Aleksandr Burakov <a.burakov@rosalinux.ru>
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: sanglipeng1 <sanglipeng1@jd.com>

parent 0efd5a47

drivers/video/fbdev/via/accel.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ static int hw_bitblt_1(void __iomem *engine, u8 op, u32 width, u32 height,

		if (op != VIA_BITBLT_FILL) {
		tmp = src_mem ? 0 : src_addr;
		if (dst_addr & 0xE0000007) {
		if (tmp & 0xE0000007) {
		printk(KERN_WARNING "hw_bitblt_1: Unsupported source "
		"address %X\n", tmp);
		return -EINVAL;
		@@ -260,7 +260,7 @@ static int hw_bitblt_2(void __iomem *engine, u8 op, u32 width, u32 height,
		writel(tmp, engine + 0x18);

		tmp = src_mem ? 0 : src_addr;
		if (dst_addr & 0xE0000007) {
		if (tmp & 0xE0000007) {
		printk(KERN_WARNING "hw_bitblt_2: Unsupported source "
		"address %X\n", tmp);
		return -EINVAL;