From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0D40C43387 for ; Thu, 20 Dec 2018 09:45:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB4A420811 for ; Thu, 20 Dec 2018 09:45:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545299105; bh=KbTvA516M1fG9PvC6V5jgBBRD+V7X6UueWPl+ToIxVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ov6UcU3Ap8O2kzIY9rI6dXEwPNWKutTVOD8kYc7sGNAVHzY99Amry08HBcBHRVd4S FYmJYdPnxZx1C9C1zr5Ft7Lcghlxwgy07qx23LmEvMu2x+YAaJRwJw3N6/rgA2/acW TGalQDq6/7gZ7Q77sHMlsykp9pC9mRZLqbW3y7GA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731408AbeLTJpE (ORCPT ); Thu, 20 Dec 2018 04:45:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:48464 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730117AbeLTJWz (ORCPT ); Thu, 20 Dec 2018 04:22:55 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BDFE5217D9; Thu, 20 Dec 2018 09:22:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545297774; bh=KbTvA516M1fG9PvC6V5jgBBRD+V7X6UueWPl+ToIxVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LRrqjCWIgXlIUdxqOAqmZD2bPVMaUsU8xGEjjVMnjhl0mHYx31W6fkaWAWwLkGr97 +9e/7Sl70CsXAgd07BTgypAdiluYIyQ/rscUP+kNpQw22/AF0XFB7ZO0L3EOkRA25B fij//G74mido2PHkzVO//npxRzL/fjY1UnpY5oKQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tom Zanussi , "Steven Rostedt (VMware)" Subject: [PATCH 4.9 12/61] tracing: Fix memory leak in set_trigger_filter() Date: Thu, 20 Dec 2018 10:18:12 +0100 Message-Id: <20181220085844.221019004@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181220085843.743900603@linuxfoundation.org> References: <20181220085843.743900603@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Steven Rostedt (VMware) commit 3cec638b3d793b7cacdec5b8072364b41caeb0e1 upstream. When create_event_filter() fails in set_trigger_filter(), the filter may still be allocated and needs to be freed. The caller expects the data->filter to be updated with the new filter, even if the new filter failed (we could add an error message by setting set_str parameter of create_event_filter(), but that's another update). But because the error would just exit, filter was left hanging and nothing could free it. Found by kmemleak detector. Cc: stable@vger.kernel.org Fixes: bac5fb97a173a ("tracing: Add and use generic set_trigger_filter() implementation") Reviewed-by: Tom Zanussi Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace_events_trigger.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/kernel/trace/trace_events_trigger.c +++ b/kernel/trace/trace_events_trigger.c @@ -742,8 +742,10 @@ int set_trigger_filter(char *filter_str, /* The filter is for the 'trigger' event, not the triggered event */ ret = create_event_filter(file->event_call, filter_str, false, &filter); - if (ret) - goto out; + /* + * If create_event_filter() fails, filter still needs to be freed. + * Which the calling code will do with data->filter. + */ assign: tmp = rcu_access_pointer(data->filter);