diff mbox series

[4.4,18/25] drm/msm: Fix wrong size calculation

Message ID	20220201180822.737435970@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Xianting Tian <xianting.tian@linux.alibaba.com>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.4 18/25] drm/msm: Fix wrong size calculation Date: Tue, 1 Feb 2022 19:16:42 +0100 Message-Id: <20220201180822.737435970@linuxfoundation.org> In-Reply-To: <20220201180822.148370751@linuxfoundation.org> References: <20220201180822.148370751@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.4,02/25] Bluetooth: refactor malicious adv data check [4.4,03/25] s390/hypfs: include z/VM guests with access control group set [4.4,04/25] scsi: zfcp: Fix failed recovery on gone remote port with non-NPIV FCP devices [4.4,05/25] udf: Restore i_lenAlloc when inode expansion fails [4.4,06/25] udf: Fix NULL ptr deref when converting from inline format [4.4,07/25] PM: wakeup: simplify the output logic of pm_show_wakelocks() [4.4,08/25] serial: stm32: fix software flow control transfer [4.4,09/25] tty: n_gsm: fix SW flow control encoding/handling [4.4,10/25] tty: Add support for Brainboxes UC cards. [4.4,11/25] usb-storage: Add unusual-devs entry for VL817 USB-SATA bridge [4.4,12/25] USB: core: Fix hang in usb_kill_urb by adding memory barriers [4.4,13/25] scsi: bnx2fc: Flush destroy_work queue before calling bnx2fc_interface_put() [4.4,14/25] ipv6_tunnel: Rate limit warning messages [4.4,15/25] net: fix information leakage in /proc/net/ptype [4.4,16/25] ipv4: avoid using shared IP generator for connected sockets [4.4,17/25] net-procfs: show net devices bound packet types [4.4,18/25] drm/msm: Fix wrong size calculation [4.4,19/25] hwmon: (lm90) Reduce maximum conversion rate for G781 [4.4,20/25] ipv4: raw: lock the socket in raw_bind() [4.4,21/25] ipv4: tcp: send zero IPID in SYNACK messages [4.4,22/25] Bluetooth: MGMT: Fix misplaced BT_HS check [4.4,23/25] Revert "drm/radeon/ci: disable mclk switching for high refresh rates (v2)" [4.4,24/25] Revert "tc358743: fix register i2c_rd/wr function fix" [4.4,25/25] KVM: x86: Fix misplaced backport of "work around leak of uninitialized stack contents"

Commit Message

Greg KH Feb. 1, 2022, 6:16 p.m. UTC

From: Xianting Tian <xianting.tian@linux.alibaba.com>

commit 0a727b459ee39bd4c5ced19d6024258ac87b6b2e upstream.

For example, memory-region in .dts as below,
	reg = <0x0 0x50000000 0x0 0x20000000>

We can get below values,
struct resource r;
r.start = 0x50000000;
r.end	= 0x6fffffff;

So the size should be:
size = r.end - r.start + 1 = 0x20000000

Signed-off-by: Xianting Tian <xianting.tian@linux.alibaba.com>
Fixes: 072f1f9168ed ("drm/msm: add support for "stolen" mem")
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20220112123334.749776-1-xianting.tian@linux.alibaba.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/gpu/drm/msm/msm_drv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -286,7 +286,7 @@  static int msm_init_vram(struct drm_devi
 		ret = of_address_to_resource(node, 0, &r);
 		if (ret)
 			return ret;
-		size = r.end - r.start;
+		size = r.end - r.start + 1;
 		DRM_INFO("using VRAM carveout: %lx@%pa\n", size, &r.start);
 	} else
 #endif