From patchwork Sat Sep 9 03:16:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 137857 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp1488268vqo; Sun, 10 Sep 2023 01:32:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF3PqPy+a98ZfFHVFvxMY1jmpF6XXkz84VXKClNuUrCjbNtEgm+osTUFcW8bBSvtSpUusxC X-Received: by 2002:a05:6512:3290:b0:4fb:8c52:611 with SMTP id p16-20020a056512329000b004fb8c520611mr5162356lfe.38.1694334764581; Sun, 10 Sep 2023 01:32:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694334764; cv=none; d=google.com; s=arc-20160816; b=DUEHtlYZbx01QbghNblAYgP5u0pCwwl5tIdTSDJmnk8u1wjcS72mVfOAkgZR7XpW0F zblm1IZw0lon3CtEzIMMARq3Z4iYhM+qmeOGIm7hgiNMvJ7zZ5vWCgnu3qmYI3f151v2 AbqLMYBUVfmaSXuP++Uatn8u5/GKEWmxnT5DojHefroVW7VMmd1OP2AY4barmuYux5oR W0tRpHTJPimRBa3rQsDMvaiEXkUjKFlekw7XFvCrKkk97zngg7djjP4eJTTND75oJE46 X/qIyag/YtBXMGSgKK5M13dw3C5aV+FLgACGoiILw5x0cofi+atqbDImDUxSAqRYbG+C ZQNg== 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=cYw8noLMnBC5vTojwxsT8ja+be3XAiAfSDfZTVDq4gY=; fh=Flox7kw3EEVQs2h84utvXZ0uTwTh44oufEJTr1Mxlxc=; b=QqjnrcnxBTUMQO3Ac1MJPinCd9lIzPDOq96d1irjvn56eFahWa1lokIOcsLMiGcmdj 89srSJaeLPROuNIWHUCu75xMMufU0yc4wThWAthET8xuqSGG55uRnt68/+OBkc5+tsoq JQXQU0mxVEVubqYWgOmRgYmOR1WWbKT9fNbKE0I4qwyDxFFmxPpu0OlG4k8j/eG2P1Ik YiQfLi5nkeMmraNHIjlRCaZT+9/a3oj0D5u2kFtSxBL3HzA7grLlXaO0J4mMYyBnmu8f 4n8m6y6mNxkDseNXWMN5XiZ6lK9VhcgJMQC/xb1aqatRsxM1WtCXtouq5KqnbRMeyss3 D/Ig== 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 pw3-20020a17090720a300b00992dc9d3b33si4435592ejb.863.2023.09.10.01.32.41; Sun, 10 Sep 2023 01:32:44 -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 S239463AbjIIDXs (ORCPT + 11 others); Fri, 8 Sep 2023 23:23:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232844AbjIIDXg (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 B13091FDB; Fri, 8 Sep 2023 20:23:32 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1D78C433A9; Sat, 9 Sep 2023 03:23:30 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qeoZZ-000Yg1-1L; Fri, 08 Sep 2023 23:23:49 -0400 Message-ID: <20230909032349.228464292@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 08 Sep 2023 23:16:21 -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 06/15] tracing: Have current_trace 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: 1776638770130654161 X-GMAIL-MSGID: 1776638770130654161 From: "Steven Rostedt (Google)" The current_trace updates the trace array tracer. 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 current_trace is opened. Link: https://lkml.kernel.org/r/20230907024803.877687227@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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c8b8b4c6feaf..b82df33d20ff 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -7791,10 +7791,11 @@ static const struct file_operations tracing_max_lat_fops = { #endif static const struct file_operations set_tracer_fops = { - .open = tracing_open_generic, + .open = tracing_open_generic_tr, .read = tracing_set_trace_read, .write = tracing_set_trace_write, .llseek = generic_file_llseek, + .release = tracing_release_generic_tr, }; static const struct file_operations tracing_pipe_fops = {