70 lines
2.3 KiB
Diff
70 lines
2.3 KiB
Diff
|
From c73b18ef8f2dd15934d90f65ba825bef19d11f73 Mon Sep 17 00:00:00 2001
|
||
|
|
From: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 7 Nov 2024 22:07:23 -0500
|
||
|
|
Subject: [PATCH] ppc/xive: Fix ESB length overflow on 32-bit hosts
|
||
|
|
|
||
|
|
cheery-pick from 07f2770503e24889720028ddf9ef54788ddf3b6d
|
||
|
|
|
||
|
|
The length of this region can be > 32-bits, which overflows size_t on
|
||
|
|
32-bit hosts. Change to uint64_t.
|
||
|
|
|
||
|
|
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
|
||
|
|
Signed-off-by: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/intc/spapr_xive_kvm.c | 4 ++--
|
||
|
|
hw/intc/xive.c | 2 +-
|
||
|
|
include/hw/ppc/xive.h | 2 +-
|
||
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c
|
||
|
|
index 5789062379..7a86197fc9 100644
|
||
|
|
--- a/hw/intc/spapr_xive_kvm.c
|
||
|
|
+++ b/hw/intc/spapr_xive_kvm.c
|
||
|
|
@@ -720,7 +720,7 @@ int kvmppc_xive_connect(SpaprInterruptController *intc, uint32_t nr_servers,
|
||
|
|
{
|
||
|
|
SpaprXive *xive = SPAPR_XIVE(intc);
|
||
|
|
XiveSource *xsrc = &xive->source;
|
||
|
|
- size_t esb_len = xive_source_esb_len(xsrc);
|
||
|
|
+ uint64_t esb_len = xive_source_esb_len(xsrc);
|
||
|
|
size_t tima_len = 4ull << TM_SHIFT;
|
||
|
|
CPUState *cs;
|
||
|
|
int fd;
|
||
|
|
@@ -824,7 +824,7 @@ void kvmppc_xive_disconnect(SpaprInterruptController *intc)
|
||
|
|
{
|
||
|
|
SpaprXive *xive = SPAPR_XIVE(intc);
|
||
|
|
XiveSource *xsrc;
|
||
|
|
- size_t esb_len;
|
||
|
|
+ uint64_t esb_len;
|
||
|
|
|
||
|
|
assert(xive->fd != -1);
|
||
|
|
|
||
|
|
diff --git a/hw/intc/xive.c b/hw/intc/xive.c
|
||
|
|
index a3585593d8..0cfc172dd4 100644
|
||
|
|
--- a/hw/intc/xive.c
|
||
|
|
+++ b/hw/intc/xive.c
|
||
|
|
@@ -1238,7 +1238,7 @@ static void xive_source_reset(void *dev)
|
||
|
|
static void xive_source_realize(DeviceState *dev, Error **errp)
|
||
|
|
{
|
||
|
|
XiveSource *xsrc = XIVE_SOURCE(dev);
|
||
|
|
- size_t esb_len = xive_source_esb_len(xsrc);
|
||
|
|
+ uint64_t esb_len = xive_source_esb_len(xsrc);
|
||
|
|
|
||
|
|
assert(xsrc->xive);
|
||
|
|
|
||
|
|
diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h
|
||
|
|
index f120874e0f..00023c0233 100644
|
||
|
|
--- a/include/hw/ppc/xive.h
|
||
|
|
+++ b/include/hw/ppc/xive.h
|
||
|
|
@@ -218,7 +218,7 @@ static inline bool xive_source_esb_has_2page(XiveSource *xsrc)
|
||
|
|
xsrc->esb_shift == XIVE_ESB_4K_2PAGE;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static inline size_t xive_source_esb_len(XiveSource *xsrc)
|
||
|
|
+static inline uint64_t xive_source_esb_len(XiveSource *xsrc)
|
||
|
|
{
|
||
|
|
return (1ull << xsrc->esb_shift) * xsrc->nr_irqs;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|