FAILED: patch "[PATCH] genirq/debugfs: Add missing sanity checks to interrupt" failed to apply to 4.19-stable tree

PATCH [email protected] 1 participant 1 message Apr 14, 2020

Subsystems (2)

Stable branch IRQ

lore

Share & tools

lore

[email protected]

author maintainer

2020-04-14 12:18 UTC #0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From a740a423c36932695b01a3e920f697bc55b05fec Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <[email protected]>
Date: Fri, 6 Mar 2020 14:03:42 +0100
Subject: [PATCH] genirq/debugfs: Add missing sanity checks to interrupt
injection

Interrupts cannot be injected when the interrupt is not activated and when a replay is already in progress.

Fixes 536e2e34bd00 ("genirq/debugfs: Triggering of interrupts from userspace")

Signed-off-by Thomas Gleixner <[email protected]>

Acked-by Marc Zyngier <[email protected]>

Cc [email protected]

Link https://lkml.kernel.org/r/[email protected] open here

kernel/irq/debugfs.c +9 -2

index a949bd39e343..d44c8fd17609 100644
@@ -206,8 +206,15 @@ static ssize_t irq_debug_write(struct file *file, const char __user *user_buf,
 		chip_bus_lock(desc);
 		raw_spin_lock_irqsave(&desc->lock, flags);
 
-		if (irq_settings_is_level(desc) || desc->istate & IRQS_NMI) {
-			/* Can't do level nor NMIs, sorry */
+		/*
+		 * Don't allow injection when the interrupt is:
+		 *  - Level or NMI type
+		 *  - not activated
+		 *  - replaying already
+		 */
+		if (irq_settings_is_level(desc) ||
+		    !irqd_is_activated(&desc->irq_data) ||
+		    (desc->istate & (IRQS_NMI | IRQS_REPLAY))) {
 			err = -EINVAL;
 		} else {
 			desc->istate |= IRQS_PENDING;