[GIT pull] irq/urgent for 5.3-rc1

[Thomas Gleixner]

Linus,

please pull the latest irq-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git 
irq-urgent-for-linus

up to:  20faba848752: irqchip/gic-v3-its: Fix misuse of GENMASK macro

Two small fixes for interrupt chip drivers:

    - Prevent UAF in the new RZA1 chip driver

    - Fix the wrong argument order of the GENMASK macro in the GIC code

Thanks,

        tglx

------------------>
Joe Perches (1):
      irqchip/gic-v3-its: Fix misuse of GENMASK macro

Wen Yang (1):
      irqchip/renesas-rza1: Prevent use-after-free in rza1_irqc_probe()


 drivers/irqchip/irq-gic-v3-its.c   |  2 +-
 drivers/irqchip/irq-renesas-rza1.c | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 35500801dc2b..730fbe0e2a9d 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -185,7 +185,7 @@ static struct its_collection *dev_event_to_col(struct 
its_device *its_dev,
 
 static struct its_collection *valid_col(struct its_collection *col)
 {
-       if (WARN_ON_ONCE(col->target_address & GENMASK_ULL(0, 15)))
+       if (WARN_ON_ONCE(col->target_address & GENMASK_ULL(15, 0)))
                return NULL;
 
        return col;
diff --git a/drivers/irqchip/irq-renesas-rza1.c 
b/drivers/irqchip/irq-renesas-rza1.c
index b1f19b210190..b0d46ac42b89 100644
--- a/drivers/irqchip/irq-renesas-rza1.c
+++ b/drivers/irqchip/irq-renesas-rza1.c
@@ -208,20 +208,19 @@ static int rza1_irqc_probe(struct platform_device *pdev)
                return PTR_ERR(priv->base);
 
        gic_node = of_irq_find_parent(np);
-       if (gic_node) {
+       if (gic_node)
                parent = irq_find_host(gic_node);
-               of_node_put(gic_node);
-       }
 
        if (!parent) {
                dev_err(dev, "cannot find parent domain\n");
-               return -ENODEV;
+               ret = -ENODEV;
+               goto out_put_node;
        }
 
        ret = rza1_irqc_parse_map(priv, gic_node);
        if (ret) {
                dev_err(dev, "cannot parse %s: %d\n", "interrupt-map", ret);
-               return ret;
+               goto out_put_node;
        }
 
        priv->chip.name = "rza1-irqc",
@@ -237,10 +236,12 @@ static int rza1_irqc_probe(struct platform_device *pdev)
                                                    priv);
        if (!priv->irq_domain) {
                dev_err(dev, "cannot initialize irq domain\n");
-               return -ENOMEM;
+               ret = -ENOMEM;
        }
 
-       return 0;
+out_put_node:
+       of_node_put(gic_node);
+       return ret;
 }
 
 static int rza1_irqc_remove(struct platform_device *pdev)