Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1866756ybz; Thu, 30 Apr 2020 06:56:21 -0700 (PDT) X-Google-Smtp-Source: APiQypLmrTJha439DWAyN2py064aw/D7rQiCy1HBosk+HmT97mJPvWDWnkITbv6FQg4Sv7OkHl9p X-Received: by 2002:a17:906:adb:: with SMTP id z27mr2765946ejf.263.1588254981225; Thu, 30 Apr 2020 06:56:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588254981; cv=none; d=google.com; s=arc-20160816; b=zEEs1Isf+CZIxnk7t1gN+IULLX0+Br3gCTAzy6OwXJzUrGjB3KEJvTfAXDbP4cnalR //y6ZIgKQ2RTs7J95NOCPahqHklBh2RS6RNbLe6xZCnA9vn3gvk046pmmexvX0s45sIT Mif0Z1Zthy6iA1EBag2e8iO0a1/EiuwsdUjdke2FMBj6VFyXoBKg7XuaioZchk1dMB/b FjVK+4AJpcvq6ZU0yMUZnUOPIw/+3NZQmyiiGCceofyCGUvWICY6a1D8b7RAFdKKjhi8 XLbSg1+Vlh/rQ3t0p5HfDnIZiFgKL1RDWEe0BRxf4l5QHufXSJH0nttCwL0wM//o9obU IUzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=J8Dx4phkqvDZumRvM/UL/O9LCyAVsIkern30izjgXfE=; b=m76OnrS1cvvu/RbnrhNRUnYfpaeIqiAbWEQNY2w6yUskbXpgDjn6UJr5A5Nt7xufrv JC2RKokxwfOpiEzoa06fnDPmp+FVKERo9p5vfHBhxvhTjjOccwVu+vFzm31dO5fxXp+g AZpw2B5l74FOAj4jLQjR3/WwIP094EyIorFunK6Y8oR7sUrLCXVGrdv7aPm2rh1CBoiO 8LtmNTy6BVVL5+8sKnmmF1WpNQyQGMhXK/dI6lBC3XC48CtHEYOB10jHVs/RefXcaiIx n77se4aRHQvoSuO6UatuowcjHrF0pIp1LqilMEDFvahQM4kCPFpmK1pJ66R1fDZtF9Ec 3p/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pc4jPdnK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id me19si5909258ejb.140.2020.04.30.06.55.57; Thu, 30 Apr 2020 06:56:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pc4jPdnK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728329AbgD3NwM (ORCPT + 99 others); Thu, 30 Apr 2020 09:52:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:60766 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728243AbgD3Nv5 (ORCPT ); Thu, 30 Apr 2020 09:51:57 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 0EB77208D6; Thu, 30 Apr 2020 13:51:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254716; bh=iw4toVuYkRpmrlvVQJwhG1kN7mqnSLu2YFYTlvrElgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pc4jPdnK6TMNqb9TLuKHm2fJuegct3UFS6zK6KBgdAgiKD/U7dFQTSwAz+xhiHWfk P9DQ9leMZDHCTV2fIRP/6hKeEuc4ae+4Dotdcw8+6uFdWbfrldtjTpCqi2z6H475p/ t/XZwUhX5Aj6nBJB+WWMwRKXYTEw2uFO4h8rBpHU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vamshi K Sthambamkadi , Steven Rostedt , Sasha Levin Subject: [PATCH AUTOSEL 5.6 64/79] tracing: Fix memory leaks in trace_events_hist.c Date: Thu, 30 Apr 2020 09:50:28 -0400 Message-Id: <20200430135043.19851-64-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430135043.19851-1-sashal@kernel.org> References: <20200430135043.19851-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: Vamshi K Sthambamkadi [ Upstream commit 9da73974eb9c965dd9989befb593b8c8da9e4bdc ] kmemleak report 1: [<9092c50b>] kmem_cache_alloc_trace+0x138/0x270 [<05a2c9ed>] create_field_var+0xcf/0x180 [<528a2d68>] action_create+0xe2/0xc80 [<63f50b61>] event_hist_trigger_func+0x15b5/0x1920 [<28ea5d3d>] trigger_process_regex+0x7b/0xc0 [<3138e86f>] event_trigger_write+0x4d/0xb0 [] __vfs_write+0x30/0x200 [<4f424a0d>] vfs_write+0x96/0x1b0 [] ksys_write+0x53/0xc0 [<3717101a>] __ia32_sys_write+0x15/0x20 [] do_fast_syscall_32+0x70/0x250 [<46e2629c>] entry_SYSENTER_32+0xaf/0x102 This is because save_vars[] of struct hist_trigger_data are not destroyed kmemleak report 2: [<9092c50b>] kmem_cache_alloc_trace+0x138/0x270 [<6e5e97c5>] create_var+0x3c/0x110 [] create_field_var+0xaf/0x180 [<528a2d68>] action_create+0xe2/0xc80 [<63f50b61>] event_hist_trigger_func+0x15b5/0x1920 [<28ea5d3d>] trigger_process_regex+0x7b/0xc0 [<3138e86f>] event_trigger_write+0x4d/0xb0 [] __vfs_write+0x30/0x200 [<4f424a0d>] vfs_write+0x96/0x1b0 [] ksys_write+0x53/0xc0 [<3717101a>] __ia32_sys_write+0x15/0x20 [] do_fast_syscall_32+0x70/0x250 [<46e2629c>] entry_SYSENTER_32+0xaf/0x102 struct hist_field allocated through create_var() do not initialize "ref" field to 1. The code in __destroy_hist_field() does not destroy object if "ref" is initialized to zero, the condition if (--hist_field->ref > 1) always passes since unsigned int wraps. kmemleak report 3: [] __kmalloc_track_caller+0x139/0x2b0 [] kstrdup+0x27/0x50 [<39d70006>] init_var_ref+0x58/0xd0 [<8ca76370>] create_var_ref+0x89/0xe0 [] action_create+0x38f/0xc80 [<7c146821>] event_hist_trigger_func+0x15b5/0x1920 [<07de3f61>] trigger_process_regex+0x7b/0xc0 [] event_trigger_write+0x4d/0xb0 [<19bf1512>] __vfs_write+0x30/0x200 [<64ce4d27>] vfs_write+0x96/0x1b0 [] ksys_write+0x53/0xc0 [<7d4230cd>] __ia32_sys_write+0x15/0x20 [<8eadca00>] do_fast_syscall_32+0x70/0x250 [<235cf985>] entry_SYSENTER_32+0xaf/0x102 hist_fields (system & event_name) are not freed Link: http://lkml.kernel.org/r/20200422061503.GA5151@cosmos Signed-off-by: Vamshi K Sthambamkadi Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Sasha Levin --- kernel/trace/trace_events_hist.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 5f6834a2bf411..fcab11cc6833b 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -3320,6 +3320,9 @@ static void __destroy_hist_field(struct hist_field *hist_field) kfree(hist_field->name); kfree(hist_field->type); + kfree(hist_field->system); + kfree(hist_field->event_name); + kfree(hist_field); } @@ -4382,6 +4385,7 @@ static struct hist_field *create_var(struct hist_trigger_data *hist_data, goto out; } + var->ref = 1; var->flags = HIST_FIELD_FL_VAR; var->var.idx = idx; var->var.hist_data = var->hist_data = hist_data; @@ -5011,6 +5015,9 @@ static void destroy_field_vars(struct hist_trigger_data *hist_data) for (i = 0; i < hist_data->n_field_vars; i++) destroy_field_var(hist_data->field_vars[i]); + + for (i = 0; i < hist_data->n_save_vars; i++) + destroy_field_var(hist_data->save_vars[i]); } static void save_field_var(struct hist_trigger_data *hist_data, -- 2.20.1