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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 23C23C432C3 for ; Sat, 16 Nov 2019 16:11:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DFFF0214DE for ; Sat, 16 Nov 2019 16:11:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573920706; bh=4JUphUXaKzuXi8JFfFbcAAFZaGvFQBHCrxl018O+3uk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LC2dHGEPiPPD1FhD8TIbJTtWzEWfKWZ+mdT8XGm3mVGaqmkbXtICbqIbMEeukTEi5 QwP7OiUapaWLssb9RMcKcr7kG4XOlozUp7/YDJpwTCLv7xzfY4doiudDdwTFjvRuHJ zTpAuyQr/OS3XZndpX0wjVoWuzR1tTl2r7XWSYL0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731863AbfKPQLo (ORCPT ); Sat, 16 Nov 2019 11:11:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:55742 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730100AbfKPPse (ORCPT ); Sat, 16 Nov 2019 10:48:34 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CC3682086A; Sat, 16 Nov 2019 15:48:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919314; bh=4JUphUXaKzuXi8JFfFbcAAFZaGvFQBHCrxl018O+3uk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xkKBv9234LNJhd/PncJ8YuS6bnnhrOEsh/JNoizlYuZC0uzzYN2MffIjeZ3uPCMcx P5t10RrGHEIpsA1/oNG1IZ7dyvtOncp6MTTdQSftH3CTTK+G7Qs4GWctJZIt7KMqMt YpYSpx4J76lw7IMq/aSh3gGREzEkcL8wXBWoBLGw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Richter , Hendrik Brueckner , Martin Schwidefsky , Sasha Levin , linux-s390@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 056/150] s390/perf: Return error when debug_register fails Date: Sat, 16 Nov 2019 10:45:54 -0500 Message-Id: <20191116154729.9573-56-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154729.9573-1-sashal@kernel.org> References: <20191116154729.9573-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 Richter [ Upstream commit ec0c0bb489727de0d4dca6a00be6970ab8a3b30a ] Return an error when the function debug_register() fails allocating the debug handle. Also remove the registered debug handle when the initialization fails later on. Signed-off-by: Thomas Richter Reviewed-by: Hendrik Brueckner Signed-off-by: Martin Schwidefsky Signed-off-by: Sasha Levin --- arch/s390/kernel/perf_cpum_sf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c index d99155793c26e..2e2fd9535f865 100644 --- a/arch/s390/kernel/perf_cpum_sf.c +++ b/arch/s390/kernel/perf_cpum_sf.c @@ -1610,14 +1610,17 @@ static int __init init_cpum_sampling_pmu(void) } sfdbg = debug_register(KMSG_COMPONENT, 2, 1, 80); - if (!sfdbg) + if (!sfdbg) { pr_err("Registering for s390dbf failed\n"); + return -ENOMEM; + } debug_register_view(sfdbg, &debug_sprintf_view); err = register_external_irq(EXT_IRQ_MEASURE_ALERT, cpumf_measurement_alert); if (err) { pr_cpumsf_err(RS_INIT_FAILURE_ALRT); + debug_unregister(sfdbg); goto out; } @@ -1626,6 +1629,7 @@ static int __init init_cpum_sampling_pmu(void) pr_cpumsf_err(RS_INIT_FAILURE_PERF); unregister_external_irq(EXT_IRQ_MEASURE_ALERT, cpumf_measurement_alert); + debug_unregister(sfdbg); goto out; } -- 2.20.1