diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2018-03-22 16:22:42 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2018-03-29 10:38:17 +0200 |
| commit | 29d049be9438278c47253a74cf8d0ddf36bd5d68 (patch) | |
| tree | f793b2c78101d960183bca9fdb8e6f4a2b373a5b /drivers | |
| parent | 2cd1083d79a0a8c223af430ca97884c28a1e2fc0 (diff) | |
| download | linux-stable-29d049be9438278c47253a74cf8d0ddf36bd5d68.tar.gz linux-stable-29d049be9438278c47253a74cf8d0ddf36bd5d68.tar.bz2 linux-stable-29d049be9438278c47253a74cf8d0ddf36bd5d68.zip | |
iommu/amd: Return proper error code in irq_remapping_alloc()
In the unlikely case when alloc_irq_table() is not able to return a
remap table then "ret" will be assigned with an error code. Later, the
code checks `index' and if it is negative (which it is because it is
initialized with `-1') and then then function properly aborts but
returns `-1' instead `-ENOMEM' what was intended.
In order to correct this, I assign -ENOMEM to index.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 23e26a4b708e..6107e24bed8a 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -4124,7 +4124,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq, struct amd_ir_data *data = NULL; struct irq_cfg *cfg; int i, ret, devid; - int index = -1; + int index; if (!info) return -EINVAL; @@ -4166,7 +4166,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq, WARN_ON(table->min_index != 32); index = info->ioapic_pin; } else { - ret = -ENOMEM; + index = -ENOMEM; } } else { bool align = (info->type == X86_IRQ_ALLOC_TYPE_MSI); |