* [Qemu-devel] [PATCH V2] s390x/pci: avoid sign extension in stpcifc
@ 2015-01-21 15:50 Frank Blaschka
2015-01-23 7:44 ` Markus Armbruster
2015-01-23 14:10 ` Cornelia Huck
0 siblings, 2 replies; 3+ messages in thread
From: Frank Blaschka @ 2015-01-21 15:50 UTC (permalink / raw)
To: cornelia.huck, borntraeger; +Cc: Frank Blaschka, qemu-devel
this patch avoids sign extension and fixes a data conversion
bug in stpcifc. Both issues where found by Coverity.
Signed-off-by: Frank Blaschka <blaschka@linux.vnet.ibm.com>
---
hw/s390x/s390-pci-inst.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index 5ea13e5..c269184 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -784,10 +784,10 @@ int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba)
stq_p(&fib.aisb, pbdev->routes.adapter.summary_addr);
stq_p(&fib.fmb_addr, pbdev->fmb_addr);
- data = (pbdev->isc << 28) | (pbdev->noi << 16) |
- (pbdev->routes.adapter.ind_offset << 8) | (pbdev->sum << 7) |
- pbdev->routes.adapter.summary_offset;
- stw_p(&fib.data, data);
+ data = ((uint32_t)pbdev->isc << 28) | ((uint32_t)pbdev->noi << 16) |
+ ((uint32_t)pbdev->routes.adapter.ind_offset << 8) |
+ ((uint32_t)pbdev->sum << 7) | pbdev->routes.adapter.summary_offset;
+ stl_p(&fib.data, data);
if (pbdev->fh >> ENABLE_BIT_OFFSET) {
fib.fc |= 0x80;
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-23 14:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-21 15:50 [Qemu-devel] [PATCH V2] s390x/pci: avoid sign extension in stpcifc Frank Blaschka
2015-01-23 7:44 ` Markus Armbruster
2015-01-23 14:10 ` Cornelia Huck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).