From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87EF9C2BB55 for ; Thu, 16 Apr 2020 14:23:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 634EC2076D for ; Thu, 16 Apr 2020 14:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587046986; bh=QmB29ly0Y71X/FgMW4b306XefznnlZC+fnySE+kruPU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=D/TzqBTTjETYgthCzUVmP1CjuVvZVvL4f2Vq5AYWdiHj60hApovFptmwar1jed4yK 0oMlQMlhDKy4Cw8l2P6R5HFYc8uS6nwxtzF4hdRm31vaq0t6H1c4dCubgMGCKKm1vK 8JEVZVmsyvefnmJi8aP9bKNsN3zyNPUxPgNrfpck= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394168AbgDPOXE (ORCPT ); Thu, 16 Apr 2020 10:23:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:43434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409198AbgDPN4Y (ORCPT ); Thu, 16 Apr 2020 09:56:24 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 42EBA20786; Thu, 16 Apr 2020 13:56:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587045383; bh=QmB29ly0Y71X/FgMW4b306XefznnlZC+fnySE+kruPU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ez5C69T5xogdRgxS+V+UPGPRQ+Bj39F2DDVNhStOMP7B21lCxYed8s//YgZ7Zao0Z nPcEYOUw3Snhi3OtSdItnfvggHYbEIMjLF0bkUatHx7JdbHuOCi7hoxM+n7mHyAZcr rBZutY5VM12ocFmyzElppksyICfpzXLMo3xBNmCA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Gleixner , Marc Zyngier Subject: [PATCH 5.6 113/254] genirq/debugfs: Add missing sanity checks to interrupt injection Date: Thu, 16 Apr 2020 15:23:22 +0200 Message-Id: <20200416131340.325209584@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131325.804095985@linuxfoundation.org> References: <20200416131325.804095985@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Gleixner commit a740a423c36932695b01a3e920f697bc55b05fec upstream. 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 Acked-by: Marc Zyngier Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20200306130623.500019114@linutronix.de Signed-off-by: Greg Kroah-Hartman --- kernel/irq/debugfs.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) --- a/kernel/irq/debugfs.c +++ b/kernel/irq/debugfs.c @@ -206,8 +206,15 @@ static ssize_t irq_debug_write(struct fi 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;