From patchwork Sat Dec 10 13:57:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 32026 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1326499wrr; Sat, 10 Dec 2022 06:01:43 -0800 (PST) X-Google-Smtp-Source: AA0mqf5CHonpTZ92WU612OO1Whq6xx7F+RtQLGe4E+wN7tnBkF/+CM2rlqiPkndfVxKty+94M3ei X-Received: by 2002:aa7:cd6f:0:b0:46c:3f90:f5d9 with SMTP id ca15-20020aa7cd6f000000b0046c3f90f5d9mr9118890edb.5.1670680750320; Sat, 10 Dec 2022 05:59:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670680750; cv=none; d=google.com; s=arc-20160816; b=iWVPLruZZ9TziWuAjpDd1lTzteW19MWq9YkSpVHy7032vhRiyWv+o2GF6LWo/JHHIU D0iVGDkgy3hyvZM4g3qsWUfg2NYFFJp5wMNKAwnQlXTqbmxpusTOLhNWBEO19RPBw4jL Y2OS3tKdqKUHMuqPV73rjaXE2j1HzhlZNWc/inbpEmn/ovjq9cDmheZsIFqldJvmnC14 IEqv9A0jwgMC6CSjRovU1io4LL6QNxrGJ5TMnQ4SMC1f7K4eUhxHZ5EUaDIkr1HSRnQ7 wjf/uWt+6u1YWjeh1oHx6yd/LNWHns/TMqhDmlZAgLET28iRc5C6ErPWEqSI0XfAL2W1 CQoQ== 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=JhLNSI5vzNQhc7z9EBRCc4D11XjHPuvDh/sOF90mcUw=; b=adAWFtBZhMm0K5kMipqDTovd3BLa/v2xvgD3kOiS9ugbe/bxfsVagLk3qfxK8q0VPw v0uYPSFZXVWwGFJmDxlrq9sCnmAo1TZbdABAe5G81sndyqep4duXlN4BzhJik7vbNW1p bA0Um0Q6LLcrk22JlfanIY7Jj5FmDPixhU5hxdT06lCFdqt4BzY1BN5VowGhNcxknwQy mJyP5Rpb4HxoBpAXgNGO3ZAE2kym05QA3FnnycR/kTjFEFWtrk9WWn6zr0K2fGLTmUEy b2tjfDYGOi1CeR/QfD6zzZ3fuxtpnmQvMvnUe/UHq6uDA+8TQNtZsNTdH+S7GeBBegEp 18Nw== 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 sp7-20020a170907394700b0078b88453306si1961587ejc.285.2022.12.10.05.58.47; Sat, 10 Dec 2022 05:59:10 -0800 (PST) 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 S229816AbiLJN61 (ORCPT + 99 others); Sat, 10 Dec 2022 08:58:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229529AbiLJN60 (ORCPT ); Sat, 10 Dec 2022 08:58:26 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87AF1335 for ; Sat, 10 Dec 2022 05:58:25 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 228B860C1A for ; Sat, 10 Dec 2022 13:58:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D433C433F0; Sat, 10 Dec 2022 13:58:24 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1p40Mx-000kkw-1f; Sat, 10 Dec 2022 08:58:23 -0500 Message-ID: <20221210135823.380437066@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 10 Dec 2022 08:57:51 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Beau Belgrave Subject: [for-next][PATCH 01/25] tracing/user_events: Fix call print_fmt leak References: <20221210135750.425719934@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751835738579756495?= X-GMAIL-MSGID: =?utf-8?q?1751835738579756495?= From: Beau Belgrave If user_event_trace_register() fails within user_event_parse() the call's print_fmt member is not freed. Add kfree call to fix this. Link: https://lkml.kernel.org/r/20221123183248.554-1-beaub@linux.microsoft.com Fixes: aa3b2b4c6692 ("user_events: Add print_fmt generation support for basic types") Signed-off-by: Beau Belgrave Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_user.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index 539b08ae7020..9cb53182bb31 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -1359,6 +1359,7 @@ static int user_event_parse(struct user_event_group *group, char *name, put_user: user_event_destroy_fields(user); user_event_destroy_validators(user); + kfree(user->call.print_fmt); kfree(user); return ret; }