| Message ID | 1390581822-32624-3-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Fri, 2014-01-24 at 16:43 +0000, Julien Grall wrote: > For now __setup_dt_irq can only fail if the action is already set. If in the > future, the function is updated we don't want to enable the IRQ. > > Assuming the function can fail with action = NULL, when Xen will receive the > IRQ it will segfault because do_IRQ doesn't check if action is NULL. > > Signed-off-by: Julien Grall <julien.grall@linaro.org> Acked-by: Ian Campbell <ian.campbell@citrix.com>
On Wed, 2014-02-19 at 11:24 +0000, Ian Campbell wrote: > On Fri, 2014-01-24 at 16:43 +0000, Julien Grall wrote: > > For now __setup_dt_irq can only fail if the action is already set. If in the > > future, the function is updated we don't want to enable the IRQ. > > > > Assuming the function can fail with action = NULL, when Xen will receive the > > IRQ it will segfault because do_IRQ doesn't check if action is NULL. > > > > Signed-off-by: Julien Grall <julien.grall@linaro.org> > > Acked-by: Ian Campbell <ian.campbell@citrix.com> applied just this one for now. I'm picking up trivial looking stuff from my queue I'll revisit the rest in my next pass.
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 1943f92..55e7622 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -608,8 +608,8 @@ int __init setup_dt_irq(const struct dt_irq *irq, struct irqaction *new) rc = __setup_irq(desc, irq->irq, new); spin_unlock_irqrestore(&desc->lock, flags); - desc->handler->startup(desc); - + if ( !rc ) + desc->handler->startup(desc); return rc; }
For now __setup_dt_irq can only fail if the action is already set. If in the future, the function is updated we don't want to enable the IRQ. Assuming the function can fail with action = NULL, when Xen will receive the IRQ it will segfault because do_IRQ doesn't check if action is NULL. Signed-off-by: Julien Grall <julien.grall@linaro.org> --- xen/arch/arm/gic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)