pnv/xive2: Always pass a presenter object when accessing the TIMA
PATCH 1/1 pnv/xive2: Always pass a presenter object when accessing the TIMA
The low-level functions to access the TIMA take a presenter object as a first argument. When accessing the TIMA from the IC BAR, i.e. indirect calls, we currently pass a NULL pointer for the presenter argument. While it appears ok with the current usage, it's dangerous. And it's pretty easy to figure out the presenter in that context, so this patch fixes it.
--- hw/intc/pnv_xive2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
hw/intc/pnv_xive2.c +4 -2
@@ -1624,6 +1624,7 @@ static uint64_t pnv_xive2_ic_tm_indirect_read(void *opaque, hwaddr offset, unsigned size) {PnvXive2 *xive =PNV_XIVE2 (opaque); +XivePresenter *xptr =XIVE_PRESENTER (xive);hwaddr hw_page_offset;uint32_t pir;XiveTCTX *tctx;
@@ -1633,7 +1634,7 @@ static uint64_t pnv_xive2_ic_tm_indirect_read(void *opaque, hwaddr offset, hw_page_offset =pnv_xive2_ic_tm_get_hw_page_offset (xive, offset); tctx =pnv_xive2_get_indirect_tctx (xive, pir);if (tctx) { - val =xive_tctx_tm_read (NULL , tctx, hw_page_offset, size); + val =xive_tctx_tm_read (xptr, tctx, hw_page_offset, size); }return val;
@@ -1643,6 +1644,7 @@ static void pnv_xive2_ic_tm_indirect_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) {PnvXive2 *xive =PNV_XIVE2 (opaque); +XivePresenter *xptr =XIVE_PRESENTER (xive);hwaddr hw_page_offset;uint32_t pir;XiveTCTX *tctx;
@@ -1651,7 +1653,7 @@ static void pnv_xive2_ic_tm_indirect_write(void *opaque, hwaddr offset, hw_page_offset =pnv_xive2_ic_tm_get_hw_page_offset (xive, offset); tctx =pnv_xive2_get_indirect_tctx (xive, pir);if (tctx) { -xive_tctx_tm_write (NULL , tctx, hw_page_offset, val, size); +xive_tctx_tm_write (xptr, tctx, hw_page_offset, val, size); } }
Signature · 1 line
2.41.0
Quoted 8 lines · Frederic Barrat
The low-level functions to access the TIMA take a presenter object as a first argument. When accessing the TIMA from the IC BAR, i.e. indirect calls, we currently pass a NULL pointer for the presenter argument. While it appears ok with the current usage, it's dangerous. And it's pretty easy to figure out the presenter in that context, so this patch fixes it.
Signed-off-by Frederic Barrat <[email protected]>
Thanks,
C.
Quoted 42 lines
--- hw/intc/pnv_xive2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)hw/intc/pnv_xive2.c +4
-2@@ -1624,6 +1624,7 @@ static uint64_t pnv_xive2_ic_tm_indirect_read(void *opaque, hwaddr offset, unsigned size) {PnvXive2 *xive =PNV_XIVE2 (opaque); +XivePresenter *xptr =XIVE_PRESENTER (xive);hwaddr hw_page_offset;uint32_t pir;XiveTCTX *tctx;@@ -1633,7 +1634,7 @@ static uint64_t pnv_xive2_ic_tm_indirect_read(void *opaque, hwaddr offset, hw_page_offset =pnv_xive2_ic_tm_get_hw_page_offset (xive, offset); tctx =pnv_xive2_get_indirect_tctx (xive, pir);if (tctx) { - val =xive_tctx_tm_read (NULL , tctx, hw_page_offset, size); + val =xive_tctx_tm_read (xptr, tctx, hw_page_offset, size); }return val;@@ -1643,6 +1644,7 @@ static void pnv_xive2_ic_tm_indirect_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) {PnvXive2 *xive =PNV_XIVE2 (opaque); +XivePresenter *xptr =XIVE_PRESENTER (xive);hwaddr hw_page_offset;uint32_t pir;XiveTCTX *tctx;@@ -1651,7 +1653,7 @@ static void pnv_xive2_ic_tm_indirect_write(void *opaque, hwaddr offset, hw_page_offset =pnv_xive2_ic_tm_get_hw_page_offset (xive, offset); tctx =pnv_xive2_get_indirect_tctx (xive, pir);if (tctx) { -xive_tctx_tm_write (NULL , tctx, hw_page_offset, val, size); +xive_tctx_tm_write (xptr, tctx, hw_page_offset, val, size); } }
Daniel Henrique Barboza
AppliedQueued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks,
Daniel
Quoted 50 lines · Frederic Barrat
The low-level functions to access the TIMA take a presenter object as a first argument. When accessing the TIMA from the IC BAR, i.e. indirect calls, we currently pass a NULL pointer for the presenter argument. While it appears ok with the current usage, it's dangerous. And it's pretty easy to figure out the presenter in that context, so this patch fixes it.
Signed-off-by Frederic Barrat <[email protected]>--- hw/intc/pnv_xive2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)hw/intc/pnv_xive2.c +4
-2@@ -1624,6 +1624,7 @@ static uint64_t pnv_xive2_ic_tm_indirect_read(void *opaque, hwaddr offset, unsigned size) {PnvXive2 *xive =PNV_XIVE2 (opaque); +XivePresenter *xptr =XIVE_PRESENTER (xive);hwaddr hw_page_offset;uint32_t pir;XiveTCTX *tctx;@@ -1633,7 +1634,7 @@ static uint64_t pnv_xive2_ic_tm_indirect_read(void *opaque, hwaddr offset, hw_page_offset =pnv_xive2_ic_tm_get_hw_page_offset (xive, offset); tctx =pnv_xive2_get_indirect_tctx (xive, pir);if (tctx) { - val =xive_tctx_tm_read (NULL , tctx, hw_page_offset, size); + val =xive_tctx_tm_read (xptr, tctx, hw_page_offset, size); }return val;@@ -1643,6 +1644,7 @@ static void pnv_xive2_ic_tm_indirect_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) {PnvXive2 *xive =PNV_XIVE2 (opaque); +XivePresenter *xptr =XIVE_PRESENTER (xive);hwaddr hw_page_offset;uint32_t pir;XiveTCTX *tctx;@@ -1651,7 +1653,7 @@ static void pnv_xive2_ic_tm_indirect_write(void *opaque, hwaddr offset, hw_page_offset =pnv_xive2_ic_tm_get_hw_page_offset (xive, offset); tctx =pnv_xive2_get_indirect_tctx (xive, pir);if (tctx) { -xive_tctx_tm_write (NULL , tctx, hw_page_offset, val, size); +xive_tctx_tm_write (xptr, tctx, hw_page_offset, val, size); } }