Messages in this thread | | | Subject | Re: [tip:irq/core] genirq: Use a common macro to go through the actions list | From | Daniel Lezcano <> | Date | Mon, 8 Feb 2016 16:26:03 +0100 |
| |
On 02/08/2016 11:48 AM, tip-bot for Daniel Lezcano wrote: > Commit-ID: aff62cf66ad6065ce04fc3454a11ec19714537fb > Gitweb: http://git.kernel.org/tip/aff62cf66ad6065ce04fc3454a11ec19714537fb > Author: Daniel Lezcano <daniel.lezcano@linaro.org> > AuthorDate: Thu, 14 Jan 2016 10:54:13 +0100 > Committer: Thomas Gleixner <tglx@linutronix.de> > CommitDate: Mon, 8 Feb 2016 11:45:21 +0100 > > genirq: Use a common macro to go through the actions list > > The irq code browses the list of actions differently to inspect the element > one by one. Even if it is not a problem, for the sake of consistent code, > provide a macro similar to for_each_irq_desc in order to have the same loop to > go through the actions list and use it in the code. > > [ tglx: Renamed the macro ] > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > Link: http://lkml.kernel.org/r/1452765253-31148-1-git-send-email-daniel.lezcano@linaro.org > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > --- > kernel/irq/handle.c | 5 ++--- > kernel/irq/internals.h | 3 +++ > kernel/irq/manage.c | 8 +++----- > kernel/irq/proc.c | 2 +- > kernel/irq/spurious.c | 4 +--- > 5 files changed, 10 insertions(+), 12 deletions(-) > > diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c > index 57bff78..67534d0 100644 > --- a/kernel/irq/handle.c > +++ b/kernel/irq/handle.c > @@ -136,10 +136,9 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc) > { > irqreturn_t retval = IRQ_NONE; > unsigned int flags = 0, irq = desc->irq_data.irq; > - struct irqaction *action = desc->action; > + struct irqaction *action; > > - /* action might have become NULL since we dropped the lock */ > - while (action) { > + for_each_action_of_desc(desc, action) { > irqreturn_t res; > > trace_irq_handler_entry(irq, action);
The merge lost the removal of:
action = action->next;
resulting to the NULL pointer dereference bug spotted by 01.org.
Do you want me to resend a new patch ?
-- Daniel
-- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
| |