diff options
| author | Graeme Gregory <graeme.gregory@linaro.org> | 2015-08-31 14:25:53 +0100 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2015-08-31 14:25:53 +0100 |
| commit | 59d42b5b5391ecb14e8cba9142520fb737255159 (patch) | |
| tree | 423bcc0e87099078c0849f11c24a5c931dd3cc96 | |
| parent | 3e5285a29c6a069003ef6f40b03b4dce36936d78 (diff) | |
Correct BAD_MADT_ENTRY mergeleg-mainline-20150831.0leg-kernel
Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
| -rw-r--r-- | drivers/irqchip/irq-gic-v2m.c | 2 | ||||
| -rw-r--r-- | drivers/irqchip/irq-gic-v3.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c index cb07ab2daefa..2783706ead10 100644 --- a/drivers/irqchip/irq-gic-v2m.c +++ b/drivers/irqchip/irq-gic-v2m.c @@ -382,8 +382,6 @@ acpi_parse_madt_msi(struct acpi_subtable_header *header, struct acpi_madt_generic_msi_frame *m; m = (struct acpi_madt_generic_msi_frame *)header; - if (BAD_MADT_ENTRY(m, end)) - return -EINVAL; res.start = m->base_address; res.end = m->base_address + 0x1000; diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 34e5443c3955..c7d0f9261a3c 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -925,7 +925,7 @@ gic_acpi_match_redist(struct acpi_subtable_header *header, struct acpi_madt_generic_redistributor *redist; redist = (struct acpi_madt_generic_redistributor *)header; - if (BAD_MADT_ENTRY(redist, end) || !redist->base_address) + if (!redist->base_address) return -EINVAL; return 0; @@ -1005,9 +1005,6 @@ gic_acpi_parse_madt_distributor(struct acpi_subtable_header *header, dist = (struct acpi_madt_generic_distributor *)header; - if (BAD_MADT_ENTRY(dist, end)) - return -EINVAL; - dist_phys_base = dist->base_address; return 0; } |