From patchwork Sat Sep 9 03:16:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 137828 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp1029313vqo; Sat, 9 Sep 2023 02:05:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFe4/D7jT5U2A50qz4KCh0bNMou5vRHoXiBdoROwK1z+4xySlYLjY47/EURqNuBEfrvUGjJ X-Received: by 2002:a05:651c:235:b0:2bc:bc70:263f with SMTP id z21-20020a05651c023500b002bcbc70263fmr3495598ljn.0.1694250336704; Sat, 09 Sep 2023 02:05:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694250336; cv=none; d=google.com; s=arc-20160816; b=L51zBGsjrYdiNx6NAqpaP1ogxl81TK+N4TcBNsE6c7rnJ1gNa1sXWKBJLthyC3bT5e 8bKVPshs9kfpY087cFAMfjs5Kl/PPEDt7VIbiFHWn7uFD6P/oH4w1zK8rPsbAsqLlVRP nMBHtRN1O4grhQQJaTEGAg7wofGIxjeUNZsgQNdOXUV8UUtPYLRCihCfYuX9zAiU4Dhi j6PzOjK5FNzar/WSRK/b2EI3Uhvkb4cT4Z/+1mvkiTzFFizelddv2dJ3fSDBp57IbKRV Ds5bFoZh2nvglOew454pWAO4qAljuXM4kErIYjqb19tjUQvaAnCM/YELihrWrLwN509N Lykw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=KOsTckPFPWm9oP6rzRba2uPGNgwLSu5G+Jptxd16U5I=; fh=Flox7kw3EEVQs2h84utvXZ0uTwTh44oufEJTr1Mxlxc=; b=r7+mHXEnOSsGDkpxAJ5JCGrGvU9FUVLKiTFUdttEHqFWEmWcv5lh9Rg7Q2xLOF2gl2 XBRdRe4lnOLFuAKysxLDWmgx2F+bul4UQPI8bk1FqH3FV4NBmLqTFANZzAjs7Juky9qd P9gnzS9USY5f/IjRZD3oBMoaFLcyTQPtNvvWJepsF3Ds8f/XfDhbgzel7Pq9Alzy8mf6 KTyaGYqITU1BcGLL7QXCaNVrctBWHbZZLailucdrmCOnElHRbVzmeCeoSEOrKpuY4Tiv KJyFI1z1JBzqETxjPMv3H6+GVpR8r4uMOGF7Sa0JEpnq5dW/PKDORs12dAqVvNc0bnIw TS+A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b9-20020a1709062b4900b0099bd046b94bsi2773494ejg.1050.2023.09.09.02.05.32; Sat, 09 Sep 2023 02:05:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237587AbjIIDX5 (ORCPT + 15 others); Fri, 8 Sep 2023 23:23:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232915AbjIIDXg (ORCPT ); Fri, 8 Sep 2023 23:23:36 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9D211FE5; Fri, 8 Sep 2023 20:23:32 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7BA6C43397; Sat, 9 Sep 2023 03:23:30 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qeoZZ-000Ygb-20; Fri, 08 Sep 2023 23:23:49 -0400 Message-ID: <20230909032349.439567528@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 08 Sep 2023 23:16:22 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , stable@vger.kernel.org, Zheng Yejian , Linux Kernel Functional Testing , Naresh Kamboju Subject: [for-linus][PATCH 07/15] tracing: Have option files inc the trace array ref count References: <20230909031615.047488015@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776550240603940545 X-GMAIL-MSGID: 1776550240603940545 From: "Steven Rostedt (Google)" The option files update the options for a given trace array. For an instance, if the file is opened and the instance is deleted, reading or writing to the file will cause a use after free. Up the ref count of the trace_array when an option file is opened. Link: https://lkml.kernel.org/r/20230907024804.086679464@goodmis.org Link: https://lore.kernel.org/all/1cb3aee2-19af-c472-e265-05176fe9bd84@huawei.com/ Cc: stable@vger.kernel.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Andrew Morton Cc: Zheng Yejian Fixes: 8530dec63e7b4 ("tracing: Add tracing_check_open_get_tr()") Tested-by: Linux Kernel Functional Testing Tested-by: Naresh Kamboju Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index b82df33d20ff..0608ad20cf30 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -8988,12 +8988,33 @@ trace_options_write(struct file *filp, const char __user *ubuf, size_t cnt, return cnt; } +static int tracing_open_options(struct inode *inode, struct file *filp) +{ + struct trace_option_dentry *topt = inode->i_private; + int ret; + + ret = tracing_check_open_get_tr(topt->tr); + if (ret) + return ret; + + filp->private_data = inode->i_private; + return 0; +} + +static int tracing_release_options(struct inode *inode, struct file *file) +{ + struct trace_option_dentry *topt = file->private_data; + + trace_array_put(topt->tr); + return 0; +} static const struct file_operations trace_options_fops = { - .open = tracing_open_generic, + .open = tracing_open_options, .read = trace_options_read, .write = trace_options_write, .llseek = generic_file_llseek, + .release = tracing_release_options, }; /*