From: Greg Kroah-Hartman Date: Mon, 13 Mar 2023 14:59:36 +0000 (+0100) Subject: fuzz fixups on 5.15 X-Git-Tag: v4.14.310~76 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d962d8c9472ec4b9a65b22c65b0c003cec52d544;p=thirdparty%2Fkernel%2Fstable-queue.git fuzz fixups on 5.15 --- diff --git a/queue-5.15/irqdomain-refactor-__irq_domain_alloc_irqs.patch b/queue-5.15/irqdomain-refactor-__irq_domain_alloc_irqs.patch index a7e294fcc88..008b34a3bb1 100644 --- a/queue-5.15/irqdomain-refactor-__irq_domain_alloc_irqs.patch +++ b/queue-5.15/irqdomain-refactor-__irq_domain_alloc_irqs.patch @@ -22,14 +22,12 @@ Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20230213104302.17307-6-johan+linaro@kernel.org Signed-off-by: Sasha Levin --- - kernel/irq/irqdomain.c | 88 +++++++++++++++++++++++------------------- + kernel/irq/irqdomain.c | 88 ++++++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 40 deletions(-) -diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c -index 96ecd179717bf..e0b67784ac1e0 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c -@@ -1485,40 +1485,12 @@ int irq_domain_alloc_irqs_hierarchy(struct irq_domain *domain, +@@ -1464,40 +1464,12 @@ int irq_domain_alloc_irqs_hierarchy(stru return domain->ops->alloc(domain, irq_base, nr_irqs, arg); } @@ -73,7 +71,7 @@ index 96ecd179717bf..e0b67784ac1e0 100644 if (realloc && irq_base >= 0) { virq = irq_base; } else { -@@ -1537,24 +1509,18 @@ int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base, +@@ -1516,24 +1488,18 @@ int __irq_domain_alloc_irqs(struct irq_d goto out_free_desc; } @@ -101,7 +99,7 @@ index 96ecd179717bf..e0b67784ac1e0 100644 return virq; -@@ -1565,6 +1531,48 @@ int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base, +@@ -1544,6 +1510,48 @@ out_free_desc: return ret; } @@ -150,6 +148,3 @@ index 96ecd179717bf..e0b67784ac1e0 100644 /* The irq_data was moved, fix the revmap to refer to the new location */ static void irq_domain_fix_revmap(struct irq_data *d) { --- -2.39.2 -