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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 09229C25B7E for ; Thu, 30 May 2024 10:58:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=W/dWxaAyGF4craeZW7CDNuEsAqSEXIPtkGkaSuEMv/o=; b=wITcFZcbF4bYLT cYa04cBik981jaYLZB9Mb4KvHRsf8qTQlNAqrT5yn/Sukh8PlJVEfV3nfD4KdOJ2Lp6RKTF8fn/jK BhlM/6SZXRSQi5NiOOLIZ6IRPgPbFVXaOGCq/R5PsW3OWwfPxCcY7NnvMcoCeM2LPZMwCeMVeBrur LBbf70oYc17v2KVz58tEUw0GIic0f++tuCKFicAvugQvbvgQpfli5tlghPicXtBMJV3iWz8rVu7N+ ONL4Q8hoY57CVoejbqV/uIMb6vu1tECqRUbqD7qfVsLT8lUk2lKjXlThuIvMTC0G6hJJrbOmNTTdg 7ahRZOdiYIRb3gqGNljw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sCdTw-000000071t6-17Nl; Thu, 30 May 2024 10:58:04 +0000 Received: from smtp-fw-9102.amazon.com ([207.171.184.29]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sCdTs-000000071sK-3A4b for linux-arm-kernel@lists.infradead.org; Thu, 30 May 2024 10:58:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1717066681; x=1748602681; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=HNAz+Hha0bmN2XUtJxDAuc8OhG7Yy7pJmC4MZGBwtNs=; b=Lv53UbXbWw8TrFQC05+Sbqdoon7dpCVvuI6rDD8P88h+ZNCODMdBlZoy nCELNP3vE4FRKXuzFLGW/2D/Gdh0AVlHE1KGGok3YrWfBQlNTn/PJDWJR qlVtM1Q64l94YnkQczsGxVpYPuWzSTfTxv86kyXjhTQxX+GtJ7gEnc694 k=; X-IronPort-AV: E=Sophos;i="6.08,201,1712620800"; d="scan'208";a="422619734" Received: from pdx4-co-svc-p1-lb2-vlan3.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.25.36.214]) by smtp-border-fw-9102.sea19.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 10:57:49 +0000 Received: from EX19MTAEUC002.ant.amazon.com [10.0.10.100:17304] by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.16.54:2525] with esmtp (Farcaster) id 44dc4b34-d413-4333-8c5d-1be55b7bb1ac; Thu, 30 May 2024 10:57:48 +0000 (UTC) X-Farcaster-Flow-ID: 44dc4b34-d413-4333-8c5d-1be55b7bb1ac Received: from EX19D002EUA003.ant.amazon.com (10.252.50.18) by EX19MTAEUC002.ant.amazon.com (10.252.51.245) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Thu, 30 May 2024 10:57:47 +0000 Received: from EX19MTAUEC001.ant.amazon.com (10.252.135.222) by EX19D002EUA003.ant.amazon.com (10.252.50.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Thu, 30 May 2024 10:57:47 +0000 Received: from dev-dsk-hagarhem-1b-b868d8d5.eu-west-1.amazon.com (10.253.65.58) by mail-relay.amazon.com (10.252.135.200) with Microsoft SMTP Server id 15.2.1258.28 via Frontend Transport; Thu, 30 May 2024 10:57:47 +0000 Received: by dev-dsk-hagarhem-1b-b868d8d5.eu-west-1.amazon.com (Postfix, from userid 23002382) id DFCB820C69; Thu, 30 May 2024 10:57:46 +0000 (UTC) From: Hagar Hemdan To: CC: Maximilian Heyne , Norbert Manthey , Hagar Hemdan , Marc Zyngier , "Thomas Gleixner" , Eric Auger , , Subject: [PATCH] irqchip/gic-v3-its: Fix potential race condition in its_vlpi_prop_update() Date: Thu, 30 May 2024 10:57:13 +0000 Message-ID: <20240530105713.18552-1-hagarhem@amazon.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240530_035800_892122_C622CAF6 X-CRM114-Status: GOOD ( 12.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Similar to commit 046b5054f566 ("irqchip/gic-v3-its: Lock VLPI map array before translating it"), its_vlpi_prop_update() calls lpi_write_config() which obtains the mapping information for a VLPI. This should always be done with vlpi_lock for this device held. Otherwise, its_vlpi_prop_update() could race with its_vlpi_unmap(). This bug was discovered and resolved using Coverity Static Analysis Security Testing (SAST) by Synopsys, Inc. Fixes: 015ec0386ab6 ("irqchip/gic-v3-its: Add VLPI configuration handling") Signed-off-by: Hagar Hemdan --- drivers/irqchip/irq-gic-v3-its.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 40ebf1726393..ecaad1786345 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -1970,9 +1970,13 @@ static int its_vlpi_unmap(struct irq_data *d) static int its_vlpi_prop_update(struct irq_data *d, struct its_cmd_info *info) { struct its_device *its_dev = irq_data_get_irq_chip_data(d); + int ret = 0; - if (!its_dev->event_map.vm || !irqd_is_forwarded_to_vcpu(d)) - return -EINVAL; + raw_spin_lock(&its_dev->event_map.vlpi_lock); + if (!its_dev->event_map.vm || !irqd_is_forwarded_to_vcpu(d)) { + ret = -EINVAL; + goto out; + } if (info->cmd_type == PROP_UPDATE_AND_INV_VLPI) lpi_update_config(d, 0xff, info->config); @@ -1980,7 +1984,9 @@ static int its_vlpi_prop_update(struct irq_data *d, struct its_cmd_info *info) lpi_write_config(d, 0xff, info->config); its_vlpi_set_doorbell(d, !!(info->config & LPI_PROP_ENABLED)); - return 0; +out: + raw_spin_unlock(&its_dev->event_map.vlpi_lock); + return ret; } static int its_irq_set_vcpu_affinity(struct irq_data *d, void *vcpu_info) -- 2.40.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel