[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 1/4] pseries: Factor out check for out-of-bounds LIOBN
From: |
Alexey Kardashevskiy |
Subject: |
[Qemu-ppc] [PATCH 1/4] pseries: Factor out check for out-of-bounds LIOBN |
Date: |
Tue, 30 Apr 2013 14:33:51 +1000 |
From: David Gibson <address@hidden>
PAPR defines LIOBNs (Logical IO Bus Numbers) to be 32-bit, and we check for
values that aren't in the code for H_PUT_TCE. This patch factors the check
into spapr_tce_find_by_liobn(), which already checks if a 32-bit LIOBN
actually exists. This will become more important as future patches add
other hypercalls which need to look up a LIOBN.
At the same time we fix the typo in the message.
Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Alexey Kardashevskiy <address@hidden>
---
hw/ppc/spapr_iommu.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index d2782cf..c6aa4fe 100644
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -55,6 +55,12 @@ static sPAPRTCETable *spapr_tce_find_by_liobn(uint32_t liobn)
{
sPAPRTCETable *tcet;
+ if (liobn & 0xFFFFFFFF00000000ULL) {
+ hcall_dprintf("Request for out-of-bounds LIOBN 0x" TARGET_FMT_lx "\n",
+ liobn);
+ return NULL;
+ }
+
QLIST_FOREACH(tcet, &spapr_tce_tables, list) {
if (tcet->liobn == liobn) {
return tcet;
@@ -218,12 +224,6 @@ static target_ulong h_put_tce(PowerPCCPU *cpu,
sPAPREnvironment *spapr,
target_ulong tce = args[2];
sPAPRTCETable *tcet = spapr_tce_find_by_liobn(liobn);
- if (liobn & 0xFFFFFFFF00000000ULL) {
- hcall_dprintf("spapr_vio_put_tce on out-of-boundsw LIOBN "
- TARGET_FMT_lx "\n", liobn);
- return H_PARAMETER;
- }
-
ioba &= ~(SPAPR_TCE_PAGE_SIZE - 1);
if (tcet) {
--
1.7.10.4
- [Qemu-ppc] [0/4] General updates for pseries, Alexey Kardashevskiy, 2013/04/30
- [Qemu-ppc] [PATCH 1/4] pseries: Factor out check for out-of-bounds LIOBN,
Alexey Kardashevskiy <=
- [Qemu-ppc] [PATCH 2/4] pseries: Fix debug message for out-of-bounds address in H_PUT_TCE, Alexey Kardashevskiy, 2013/04/30
- [Qemu-ppc] [PATCH 3/4] spapr: Code more defensively against lack of primary PCI bus, Alexey Kardashevskiy, 2013/04/30
- Re: [Qemu-ppc] [PATCH 3/4] spapr: Code more defensively against lack of primary PCI bus, Alexander Graf, 2013/04/30
- Re: [Qemu-ppc] [PATCH 3/4] spapr: Code more defensively against lack of primary PCI bus, Alexey Kardashevskiy, 2013/04/30
- Re: [Qemu-ppc] [PATCH 3/4] spapr: Code more defensively against lack of primary PCI bus, Alexander Graf, 2013/04/30
- Re: [Qemu-ppc] [PATCH 3/4] spapr: Code more defensively against lack of primary PCI bus, Alexey Kardashevskiy, 2013/04/30
- Re: [Qemu-ppc] [PATCH 3/4] spapr: Code more defensively against lack of primary PCI bus, Alexander Graf, 2013/04/30
- Re: [Qemu-ppc] [PATCH 3/4] spapr: Code more defensively against lack of primary PCI bus, Alexey Kardashevskiy, 2013/04/30
- Re: [Qemu-ppc] [PATCH 3/4] spapr: Code more defensively against lack of primary PCI bus, Alexander Graf, 2013/04/30
[Qemu-ppc] [PATCH 4/4] pseries: Update SLOF firmware image, Alexey Kardashevskiy, 2013/04/30