From aaef2c62831b8268b2ff7101b6bce8ba96454f53 Mon Sep 17 00:00:00 2001 From: Zenghui Yu Date: Wed, 13 Mar 2019 10:27:29 +0800 Subject: [PATCH] irqchip/gic-v3-its: Avoid parsing _indirect_ twice for Device table mainline inclusion from mainline-5.0 commit 8d565748b603 category: bugfix bugzilla: 11456 CVE: NA ------------------------------------------------- In current logic, its_parse_indirect_baser() will be invoked twice when allocating Device tables. Add a *break* to omit the unnecessary and annoying (might be ...) invoking. Fixes: 32bd44dc19de ("irqchip/gic-v3-its: Fix the incorrect parsing of VCPU table size") Cc: stable@vger.kernel.org Signed-off-by: Zenghui Yu Signed-off-by: Marc Zyngier Signed-off-by: Hongbo Yao Reviewed-by: Yang Yingliang Signed-off-by: Yang Yingliang --- drivers/irqchip/irq-gic-v3-its.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 7d99616c295a..708defa7ed0b 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -1956,6 +1956,8 @@ static int its_alloc_tables(struct its_node *its) indirect = its_parse_indirect_baser(its, baser, psz, &order, its->device_ids); + break; + case GITS_BASER_TYPE_VCPU: indirect = its_parse_indirect_baser(its, baser, psz, &order, -- GitLab