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=-7.0 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=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 85CB6C433DF for ; Tue, 23 Jun 2020 21:23:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 64A9A20781 for ; Tue, 23 Jun 2020 21:23:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592947404; bh=SFFRbZ2VPfm2mLXXakBHghxCO8Wy7+UxQfrCa/9mkzA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VRHi1c2RH1LDtgIjzMwF352XLI8MHOBxeYcu0/7iBB6cFPX6w3oqNHTANwCzSeWnf c3x8KGKDw1bFqwJ7JlpylzNNnapPcih2DRii/9rQgeqjoNbfgO6SOFUSro8KTYm/LP sQhPOZV7lxg+aJVKJoHI/05J90ekqtbOendlOqx8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388766AbgFWUVT (ORCPT ); Tue, 23 Jun 2020 16:21:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:38932 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390023AbgFWUVS (ORCPT ); Tue, 23 Jun 2020 16:21:18 -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 906B92064B; Tue, 23 Jun 2020 20:21:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943678; bh=SFFRbZ2VPfm2mLXXakBHghxCO8Wy7+UxQfrCa/9mkzA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=irTMTPKMUkOMI9Ru8N33Y9k8rYN4m+zm6gAjOtDQHHeHJgih791qo2YO5rvCxneH9 TJC/4JIG0ffxy9fay643SATkzr97spzXbdYXQR6ZpH7eB41sCCAaiJ62CbDVGCBvYQ pgpddtbh6ri23dpP3CF3EJNrW+FMvieJG41ygXHc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Divya Indi , Kefeng Wang , "Steven Rostedt (VMware)" Subject: [PATCH 5.7 467/477] sample-trace-array: Remove trace_array sample-instance Date: Tue, 23 Jun 2020 21:57:44 +0200 Message-Id: <20200623195429.622872957@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kefeng Wang commit 9fbc01cdba66e988122ccdc6094cfd85d9587769 upstream. Remove trace_array 'sample-instance' if kthread_run fails in sample_trace_array_init(). Link: https://lkml.kernel.org/r/20200609135200.2206726-1-wangkefeng.wang@huawei.com Cc: stable@vger.kernel.org Fixes: 89ed42495ef4a ("tracing: Sample module to demonstrate kernel access to Ftrace instances.") Reviewed-by: Divya Indi Signed-off-by: Kefeng Wang Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- samples/ftrace/sample-trace-array.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/samples/ftrace/sample-trace-array.c +++ b/samples/ftrace/sample-trace-array.c @@ -107,8 +107,12 @@ static int __init sample_trace_array_ini trace_printk_init_buffers(); simple_tsk = kthread_run(simple_thread, NULL, "sample-instance"); - if (IS_ERR(simple_tsk)) + if (IS_ERR(simple_tsk)) { + trace_array_put(tr); + trace_array_destroy(tr); return -1; + } + return 0; }