Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4748901pxj; Wed, 12 May 2021 12:19:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8m+kabAm9qfLf3hC6sTnV9VsSsazkGbpberwW+Uv7DiF4vOZg6ijMc2lTy34rtkf3hWed X-Received: by 2002:a05:6402:2548:: with SMTP id l8mr45956154edb.208.1620847196366; Wed, 12 May 2021 12:19:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620847196; cv=none; d=google.com; s=arc-20160816; b=lrZHkao46qGgZghrq3MwM7sFLNmcjhxlACdndp7SyD3jSGxd1Cb+FgYRPDAD84LBa0 6yPR/VoUbNu7Ww2Pbq+lJh3Ldx/6BmdLdG3PbIL2BQL/kTvh91xTZZ4lDrk96RnYPaOy dgLGtfeXyuyf4m+GDHG/l+mVLu74UGhiJFo1pP94P0Ksiqt1miFpPfQfG4DM7wZvzHed ZwKxwzcqucblWLb4UBLd5kXME8oTwcvo0zanQ9vc4BMBb+XxJNALjMP+gO2NOVt0top2 uRH4oi9ujjar4YhkNTAugwqLs58Nhx7nzqW4Xp1K4iI0Z/Vhh6YffBucEXm8NHhgr+s8 gaGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=m4ae7S3vzWGNcN3AZaspcar3jZvIBTK9whL9jDL/7MQ=; b=ri46wBI0CmLBGH/x6c1OarU20yNCKQc45jPiYgz2UM3WrHP4ZuTDszNPKAKihDmJK1 zY3eApJhpRIMRjbzkRoYbkdXuCDcaDYSh8mrlhN7g7xZon18uMJSgyi4dq9NPZyX1o5W lizEQmcXyToYLbUm9Ax04TFb9mqnUP9ZH4kB6IBoD/Pt5QPPO1gEgdncW5Zqeof4nkFv FP80ObL3QICR89Ch/zamtQVzpDiThUILBIZ7wczwDcN2B2kbOmVsgC2esWLWm3dyQMzL TH5IwEsMDYkRAlQdGV//ClK5f0PN1oLqJWE1N3SfvmhSDCT8+lXRIYUT5UpCNkMA0JRg wMpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pT92tjMp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lk14si785033ejb.197.2021.05.12.12.19.28; Wed, 12 May 2021 12:19:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pT92tjMp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378190AbhELTKo (ORCPT + 99 others); Wed, 12 May 2021 15:10:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:36858 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237888AbhELQnO (ORCPT ); Wed, 12 May 2021 12:43:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 09A3661444; Wed, 12 May 2021 16:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620836024; bh=NNPE9PcbUhNJ6CCi2lWmO181hl1VnNt3/WoPm54I5Ks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pT92tjMpSub/C6WtaIhqtqSZkF7RhSCgTI9Ut7dgcH2El64CV1sA3eTE4Sr8YWSHt Gdw14I7uUnex8rZEufFgEZfJ4/S/EJsoPQI3QWxWhgILBjBaKmVvQcd9PwRY9w6SD9 Bkk960im4v4g9QL/sa+vOfSjd5LLCaWmy4j3QTfU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Lu Baolu , Joerg Roedel , Sasha Levin Subject: [PATCH 5.12 580/677] iommu/vt-d: Fix an error handling path in intel_prepare_irq_remapping() Date: Wed, 12 May 2021 16:50:26 +0200 Message-Id: <20210512144856.655111172@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe JAILLET [ Upstream commit 745610c4a3e3baaebf6d1f8cd5b4d82892432520 ] If 'intel_cap_audit()' fails, we should return directly, as already done in the surrounding error handling path. Fixes: ad3d19029979 ("iommu/vt-d: Audit IOMMU Capabilities and add helper functions") Signed-off-by: Christophe JAILLET Acked-by: Lu Baolu Link: https://lore.kernel.org/r/98d531caabe66012b4fffc7813fd4b9470afd517.1618124777.git.christophe.jaillet@wanadoo.fr Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/intel/irq_remapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c index 611ef5243cb6..5c16ebe037a1 100644 --- a/drivers/iommu/intel/irq_remapping.c +++ b/drivers/iommu/intel/irq_remapping.c @@ -736,7 +736,7 @@ static int __init intel_prepare_irq_remapping(void) return -ENODEV; if (intel_cap_audit(CAP_AUDIT_STATIC_IRQR, NULL)) - goto error; + return -ENODEV; if (!dmar_ir_support()) return -ENODEV; -- 2.30.2