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=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 DC975C433ED for ; Sun, 2 May 2021 14:08:40 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AA25E6102A for ; Sun, 2 May 2021 14:08:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA25E6102A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: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:List-Owner; bh=Dej4xWdeq44yNaVLxxWHlKCiqOUlKIUd5ujYeK5HuJ8=; b=DpUelDeHv8r2CsZAiFCe9zCyI bKzUHP0Gx4pci1GQ4RPgUtlCGW2z7vKX/17j0qmM4JSRcfSd0oeE+Hi7XX785IBNsEhcedRh71jzH Fajg6YkbMx+AFbWh75hnD2zF7L/RVt+OqVLs6EzhxzW8gzfrZNBFVU5b09PSlnYVGGlpCpJFQw2VG sVaVU4oMHy3N/+whfqxALoGStJpa2fuhDo317beWfpVH1JyXRDv+72e8TpkzlCi+cuFX7gTBnBSb7 i+gWuP0xlnvdoQylRYc5CKBcQ7k7q54jGe6vdXUTJFR9Ff++tHwtC0HINcbb2Y781As4ffB/U5GiC NaCCkEUUA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1ldCk5-00BtL0-0l; Sun, 02 May 2021 14:06:41 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ldCjQ-00Bt8s-UQ for linux-arm-kernel@desiato.infradead.org; Sun, 02 May 2021 14:06:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=3bmBdPriAljsfdye4ju0kkNoaOsNQ5pA9wetUrLFwzM=; b=nyxyXTmvf9LLhjiHfPgIrrH5bP vUpsRKTjNdNCSaVrsIMjXmjc9rLBfDFIuYCgcH8t6ni+xciIjLjekJvkf/7uDfFjRlcZGxLZCNsa5 f1Txh+qLEnKzqB2Y3eyIcUeVRp2PJDvSu1kWU7MrzQIIQIOPYOUmo/Pf1bzGdfFHKsf7HHgYJE84V bg+GTKrchmQYBMGe0Y/WAWnA8KqSP9fXUmyC/jGxDKFOlRj26D5aeufWqPOpKIu5mOBt40sKjj03r kHqjES3OGJwootaOjbblHicONe+4PdzcTatk0rZlw9WF+SyfwiNN/JOC90vsuDdEKGSo9+c6viw6T QQhm/abg==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ldCjO-002YZw-Bg for linux-arm-kernel@lists.infradead.org; Sun, 02 May 2021 14:05:59 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4AD24613EA; Sun, 2 May 2021 14:05:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619964358; bh=lC97Tj1ehvcUuFVzxczscYEkaTHn/Mum0iWhRqdNedE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kGQgmrVI7RolCCJS3lTfC0X6BCUOnhaR5QMpaL7o5pSp1N2GNjnSPUfmELZ81CvTN PYxSRvX5/+eiI8TPhzmsLHbzl1GjH+8e63Tsqw76ziqFWUKD/G5zOXMzkVLYDhD1vU Z9yiD5x2/vObLlA+22IU68SuReUF5cvlFF/kJiPgIWHJ9blrTf+FX5BdgJYFtECelh eu4HZc9Az0tiR/NiIAHfFHoE9sNGaEHszKGIjIOqx7ekXtaQvikKCa2kp9K+xbhAiI 5/kZKm2w4ZTP1qWzLGACWb32yEFK1lsh09R3NNYyzc68K6YYijSZACiHRND4Spn8HA Gy6/0s9XbfTIQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Robin Murphy , Will Deacon , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 10/16] perf/arm_pmu_platform: Fix error handling Date: Sun, 2 May 2021 10:05:38 -0400 Message-Id: <20210502140544.2720138-10-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210502140544.2720138-1-sashal@kernel.org> References: <20210502140544.2720138-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210502_070558_440621_4C09A1C2 X-CRM114-Status: GOOD ( 10.16 ) 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 From: Robin Murphy [ Upstream commit e338cb6bef254821a8c095018fd27254d74bfd6a ] If we're aborting after failing to register the PMU device, we probably don't want to leak the IRQs that we've claimed. Signed-off-by: Robin Murphy Link: https://lore.kernel.org/r/53031a607fc8412a60024bfb3bb8cd7141f998f5.1616774562.git.robin.murphy@arm.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/arm_pmu_platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/perf/arm_pmu_platform.c b/drivers/perf/arm_pmu_platform.c index 4428852e1da1..bd5af219ca9b 100644 --- a/drivers/perf/arm_pmu_platform.c +++ b/drivers/perf/arm_pmu_platform.c @@ -222,7 +222,7 @@ int arm_pmu_device_probe(struct platform_device *pdev, ret = armpmu_register(pmu); if (ret) - goto out_free; + goto out_free_irqs; return 0; -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel