diff options
author | Robert Richter <rrichter@cavium.com> | 2015-09-21 16:58:34 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-09-29 04:10:53 -0400 |
commit | 30f2136346cab91e1ffd9ee6370d76809f20487a (patch) | |
tree | 53e977c14eb43b1d5465a9838b441e48325d6100 /drivers/irqchip/irq-gic-v3-its.c | |
parent | 71f64340fc0eadd06036d0db9a511b6d726add1d (diff) |
irqchip/gicv3-its: Add range check for number of allocated pages
The number of pages for the its table may exceed the maximum of 256.
Adding a range check and limitting the number to its maximum.
Based on a patch from Tirumalesh Chalamarla <tchalamarla@cavium.com>.
Signed-off-by: Tirumalesh Chalamarla <tchalamarla@cavium.com>
Signed-off-by: Robert Richter <rrichter@cavium.com>
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1442869119-1814-2-git-send-email-rric@kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/irqchip/irq-gic-v3-its.c')
-rw-r--r-- | drivers/irqchip/irq-gic-v3-its.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index ac7ae2b3cb83..d9052fdf98d7 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c | |||
@@ -822,6 +822,7 @@ static int its_alloc_tables(const char *node_name, struct its_node *its) | |||
822 | u64 entry_size = GITS_BASER_ENTRY_SIZE(val); | 822 | u64 entry_size = GITS_BASER_ENTRY_SIZE(val); |
823 | int order = get_order(psz); | 823 | int order = get_order(psz); |
824 | int alloc_size; | 824 | int alloc_size; |
825 | int alloc_pages; | ||
825 | u64 tmp; | 826 | u64 tmp; |
826 | void *base; | 827 | void *base; |
827 | 828 | ||
@@ -856,6 +857,14 @@ static int its_alloc_tables(const char *node_name, struct its_node *its) | |||
856 | } | 857 | } |
857 | 858 | ||
858 | alloc_size = (1 << order) * PAGE_SIZE; | 859 | alloc_size = (1 << order) * PAGE_SIZE; |
860 | alloc_pages = (alloc_size / psz); | ||
861 | if (alloc_pages > GITS_BASER_PAGES_MAX) { | ||
862 | alloc_pages = GITS_BASER_PAGES_MAX; | ||
863 | order = get_order(GITS_BASER_PAGES_MAX * psz); | ||
864 | pr_warn("%s: Device Table too large, reduce its page order to %u (%u pages)\n", | ||
865 | node_name, order, alloc_pages); | ||
866 | } | ||
867 | |||
859 | base = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, order); | 868 | base = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, order); |
860 | if (!base) { | 869 | if (!base) { |
861 | err = -ENOMEM; | 870 | err = -ENOMEM; |
@@ -884,7 +893,7 @@ retry_baser: | |||
884 | break; | 893 | break; |
885 | } | 894 | } |
886 | 895 | ||
887 | val |= (alloc_size / psz) - 1; | 896 | val |= alloc_pages - 1; |
888 | 897 | ||
889 | writeq_relaxed(val, its->base + GITS_BASER + i * 8); | 898 | writeq_relaxed(val, its->base + GITS_BASER + i * 8); |
890 | tmp = readq_relaxed(its->base + GITS_BASER + i * 8); | 899 | tmp = readq_relaxed(its->base + GITS_BASER + i * 8); |