Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1865333ybz; Thu, 30 Apr 2020 06:54:47 -0700 (PDT) X-Google-Smtp-Source: APiQypJKkxKrinigJhZGWR5EbBLNmlvaMUgU40WeY41UeDbeTUZ7FeWY/YfFJWcD5CVWZTXxWw++ X-Received: by 2002:a17:906:b7da:: with SMTP id fy26mr2844689ejb.327.1588254887766; Thu, 30 Apr 2020 06:54:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588254887; cv=none; d=google.com; s=arc-20160816; b=JL7DwKb0nKD1B4V6m1ECIgtZfPaK802pyN2uekOZ0so86uElDmfx81ftALR9xlC3vF G+rRiIp35nJFpj44gFOEuZcClRZpMXkHKA0XrN6ZQgWzVCzoi8M7ExZGPcW992lGWK2g 2cZ1Sa3T/gfloplnav52/57Pu/U4V160HjQ/y9ngukn5UfS9C/HdgEkGDv7LbCBBIqdr /nfjjaD9oqEn44yrQTbDFOhlfVDN7xkrtb+8g2h0xQ11bxhXAmwY/Fcdp7HyZlc6PN9W fOu/OMQ+7b6iswiJxjo1289UaqyCPI520/cLkB/P/l2DtW+qZvw3OF0Oa5O8JVZMraK7 O0Uw== 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=e/6bINF+GTI6Kh+Ed4k9GEQAU4MIR2jOahA78ihE8WI=; b=dub+KB0Cfh1LgLJJetuQ1Zc+llFZ5wCNyQHZlPWp35sZ7TU1rwhZFtfqTHG+OEPBER m3ddR20DZYFR9uEnRvjLTvhwBT4Zzpv0j/2lTD9IOkO7lW57saSsHrk91tnSyaDCG8Ld 6z/gFjl6tl6aD6uOp/CTj5rWkgDrkiiKl//7ShVFqGqX4czpDd3z+LnMT/pXaWc4uFQS uKiAreYDWkHqY4HIR8ERitHEc7kXWEBs1H/2MJ/HJynCrKSg86C1EquaMEflAVkHNgY6 FEKY7lCGA4mmqK/+optAS4lDTCss8uh8AZG8P/xdkHAouAmMqjQuGoaC8arctK7Pr01p Ftvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=q9y5IkW3; 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 sb18si5992150ejb.318.2020.04.30.06.54.24; Thu, 30 Apr 2020 06:54:47 -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=q9y5IkW3; 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 S1727797AbgD3NwT (ORCPT + 99 others); Thu, 30 Apr 2020 09:52:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:60848 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728250AbgD3Nv7 (ORCPT ); Thu, 30 Apr 2020 09:51:59 -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 42AFE208DB; Thu, 30 Apr 2020 13:51:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254718; bh=rEJ6H4/AJvOgw2t1KU/iZXtjapKGf5UoV2N8eG7umdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q9y5IkW3I4fOBjLT6kQfJJ8CDH95QTRWuvwPeIx6/WS1oO9StvIdXOKp94rT+892A gxRpDMyrR+CtKbDQ7gqOlx6j2hCcpejrquzAZAfz9FA/7njWqwJma8Pl4JjyF2cRFV 7rYo7Z8Mp5vHzEjEhYpbVqx+RpkDtL92LMpEVOQM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Steven Rostedt (VMware)" , Sasha Levin Subject: [PATCH AUTOSEL 5.6 66/79] ftrace: Fix memory leak caused by not freeing entry in unregister_ftrace_direct() Date: Thu, 30 Apr 2020 09:50:30 -0400 Message-Id: <20200430135043.19851-66-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: "Steven Rostedt (VMware)" [ Upstream commit 353da87921a5ec654e7e9024e083f099f1b33c97 ] kmemleak reported the following: unreferenced object 0xffff90d47127a920 (size 32): comm "modprobe", pid 1766, jiffies 4294792031 (age 162.568s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 22 01 00 00 00 00 ad de ........"....... 00 78 12 a7 ff ff ff ff 00 00 b6 c0 ff ff ff ff .x.............. backtrace: [<00000000bb79e72e>] register_ftrace_direct+0xcb/0x3a0 [<00000000295e4f79>] do_one_initcall+0x72/0x340 [<00000000873ead18>] do_init_module+0x5a/0x220 [<00000000974d9de5>] load_module+0x2235/0x2550 [<0000000059c3d6ce>] __do_sys_finit_module+0xc0/0x120 [<000000005a8611b4>] do_syscall_64+0x60/0x230 [<00000000a0cdc49e>] entry_SYSCALL_64_after_hwframe+0x49/0xb3 The entry used to save the direct descriptor needs to be freed when unregistering. Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Sasha Levin --- kernel/trace/ftrace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index fd81c7de77a70..63089c70adbb6 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -5155,6 +5155,7 @@ int unregister_ftrace_direct(unsigned long ip, unsigned long addr) list_del_rcu(&direct->next); synchronize_rcu_tasks(); kfree(direct); + kfree(entry); ftrace_direct_func_count--; } } -- 2.20.1