summaryrefslogtreecommitdiff
authorPrasad Sodagudi <psodagud@codeaurora.org>2019-03-24 14:57:04 (GMT)
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-10 15:52:10 (GMT)
commit3df0c56eb9dcc0dcaa4491103545e782320e90bb (patch)
tree5a12468ca7897e5001a208cf40302ba17fb7b45e
parentbac7cbc738160d1f34f1c883f6103813bd77f8de (diff)
downloadcommon-3df0c56eb9dcc0dcaa4491103545e782320e90bb.zip
common-3df0c56eb9dcc0dcaa4491103545e782320e90bb.tar.gz
common-3df0c56eb9dcc0dcaa4491103545e782320e90bb.tar.bz2
genirq: Prevent use-after-free and work list corruption
[ Upstream commit 59c39840f5abf4a71e1810a8da71aaccd6c17d26 ] When irq_set_affinity_notifier() replaces the notifier, then the reference count on the old notifier is dropped which causes it to be freed. But nothing ensures that the old notifier is not longer queued in the work list. If it is queued this results in a use after free and possibly in work list corruption. Ensure that the work is canceled before the reference is dropped. Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: marc.zyngier@arm.com Link: https://lkml.kernel.org/r/1553439424-6529-1-git-send-email-psodagud@codeaurora.org Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat
-rw-r--r--kernel/irq/manage.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index cf94460..be7f489 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -332,8 +332,10 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
desc->affinity_notify = notify;
raw_spin_unlock_irqrestore(&desc->lock, flags);
- if (old_notify)
+ if (old_notify) {
+ cancel_work_sync(&old_notify->work);
kref_put(&old_notify->kref, old_notify->release);
+ }
return 0;
}