diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2019-05-28 10:42:15 +0200 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-07-23 14:57:12 -0400 |
| commit | d4200ab75cddebfa22c3c28ba049df911e244f1b (patch) | |
| tree | 3b0d1c7885d22ba9b59d3a8e8e20d92bee2807f1 | |
| parent | 3708c991edfa020b9696e48113403ac3ef9fdbb7 (diff) | |
genirq: Handle missing work_struct in irq_set_affinity_notifier()
[ Upstream commit bbc4d2a7d6ff54ba923640d9a42c7bef7185fe98 ]
The backported stable commit
59c39840f5abf ("genirq: Prevent use-after-free and work list corruption")
added cancel_work_sync() on a work_struct element which is not available
in RT.
Replace cancel_work_sync() with kthread_cancel_work_sync() on RT.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
| -rw-r--r-- | kernel/irq/manage.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 381305c48a0a..b2736d7d863b 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -385,8 +385,9 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify) raw_spin_unlock_irqrestore(&desc->lock, flags); if (old_notify) { -#ifndef CONFIG_PREEMPT_RT_BASE - /* Need to address this for PREEMPT_RT */ +#ifdef CONFIG_PREEMPT_RT_BASE + kthread_cancel_work_sync(¬ify->work); +#else cancel_work_sync(&old_notify->work); #endif kref_put(&old_notify->kref, old_notify->release); |