linux-kernel - [tip:irq/urgent] irqchip/gicv3-its: ITS table size should not be smaller than PSZ

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 20 May 2015 13:15:29 -0700
From:	tip-bot for Minghuan Lian <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	jason@...edaemon.net, Minghuan.Lian@...escale.com,
	linux-kernel@...r.kernel.org, marc.zyngier@....com,
	stuart.yoder@...escale.com, linux-arm-kernel@...ts.infradead.org,
	hpa@...or.com, mingo@...nel.org, tglx@...utronix.de
Subject: [tip:irq/urgent] irqchip/gicv3-its:
  ITS table size should not be smaller than PSZ

Commit-ID:  3ad2a5f57656a14d964b673a5a0e4ab0e583c870
Gitweb:     http://git.kernel.org/tip/3ad2a5f57656a14d964b673a5a0e4ab0e583c870
Author:     Minghuan Lian <Minghuan.Lian@...escale.com>
AuthorDate: Wed, 20 May 2015 10:13:15 -0500
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Wed, 20 May 2015 22:13:37 +0200

irqchip/gicv3-its: ITS table size should not be smaller than PSZ

When allocating a device table, if the requested allocation is smaller
than the default granule size of the ITS then, we need to round up to
the default size.

Signed-off-by: Minghuan Lian <Minghuan.Lian@...escale.com>
[ stuart: Added comments and massaged changelog ]
Signed-off-by: Stuart Yoder <stuart.yoder@...escale.com>
Reviewed-by: Marc Zygnier <marc.zyngier@....com>
Cc: <linux-arm-kernel@...ts.infradead.org>
Cc: <jason@...edaemon.net>
Link: http://lkml.kernel.org/r/1432134795-661-1-git-send-email-stuart.yoder@freescale.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
 drivers/irqchip/irq-gic-v3-its.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 9687f8a..1b7e155 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -828,7 +828,14 @@ static int its_alloc_tables(struct its_node *its)
 			u64 typer = readq_relaxed(its->base + GITS_TYPER);
 			u32 ids = GITS_TYPER_DEVBITS(typer);
 
-			order = get_order((1UL << ids) * entry_size);
+			/*
+			 * 'order' was initialized earlier to the default page
+			 * granule of the the ITS.  We can't have an allocation
+			 * smaller than that.  If the requested allocation
+			 * is smaller, round up to the default page granule.
+			 */
+			order = max(get_order((1UL << ids) * entry_size),
+				    order);
 			if (order >= MAX_ORDER) {
 				order = MAX_ORDER - 1;
 				pr_warn("%s: Device Table too large, reduce its page order to %u\n",
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/