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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 76143C43381 for ; Fri, 22 Mar 2019 13:07:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CC24213F2 for ; Fri, 22 Mar 2019 13:07:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553260043; bh=DBVnEAabiVJtN5SoaFiFssUPC5Rtsl5vb/sAGd3/BmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nnvqGUV5SRbeYF8tI9JtVbc//RIf0BgYGqAvkUu6CW53lkG3Pv6ZEhTuRWx+vx2OP Mc0pPCQDpDwoNBKqHeEEQ7ZhV+9ZEn8wAQi74+Gx/hD81q+YQC8YiysmtXp69uLsr+ ZZLECxTm2rQdy6W4meX4dFcahmXgXMDQ13nv1Z1Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730694AbfCVLgW (ORCPT ); Fri, 22 Mar 2019 07:36:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:37686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729848AbfCVLgW (ORCPT ); Fri, 22 Mar 2019 07:36:22 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 717BF21916; Fri, 22 Mar 2019 11:36:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553254582; bh=DBVnEAabiVJtN5SoaFiFssUPC5Rtsl5vb/sAGd3/BmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nJ/ZAQ2Vnxv9LebIabTnDzx1fkuiugDKIHX0ZP0nAgG8q+bkuOYMArwIj323pTqf9 sYr1vxVhyMQewguNvnrg10mWL6xiKt/ic1mtxjjQIkza3+zc/jM6GTmWNgljPIE+GT aT5nfkujRQVkAyXjeLgWk1cS8T88QUkpbC0Indh4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "zhangyi (F)" , "Steven Rostedt (VMware)" Subject: [PATCH 4.4 180/230] tracing: Do not free iter->trace in fail path of tracing_open_pipe() Date: Fri, 22 Mar 2019 12:15:18 +0100 Message-Id: <20190322111249.400120376@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111236.796964179@linuxfoundation.org> References: <20190322111236.796964179@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: zhangyi (F) commit e7f0c424d0806b05d6f47be9f202b037eb701707 upstream. Commit d716ff71dd12 ("tracing: Remove taking of trace_types_lock in pipe files") use the current tracer instead of the copy in tracing_open_pipe(), but it forget to remove the freeing sentence in the error path. There's an error path that can call kfree(iter->trace) after the iter->trace was assigned to tr->current_trace, which would be bad to free. Link: http://lkml.kernel.org/r/1550060946-45984-1-git-send-email-yi.zhang@huawei.com Cc: stable@vger.kernel.org Fixes: d716ff71dd12 ("tracing: Remove taking of trace_types_lock in pipe files") Signed-off-by: zhangyi (F) Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace.c | 1 - 1 file changed, 1 deletion(-) --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4646,7 +4646,6 @@ out: return ret; fail: - kfree(iter->trace); kfree(iter); __trace_array_put(tr); mutex_unlock(&trace_types_lock);