Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751202AbdLZQW2 (ORCPT ); Tue, 26 Dec 2017 11:22:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:34344 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750876AbdLZQW1 (ORCPT ); Tue, 26 Dec 2017 11:22:27 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A8012188F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=rostedt@goodmis.org Date: Tue, 26 Dec 2017 11:22:24 -0500 From: Steven Rostedt To: Chunyan Zhang Cc: Ingo Molnar , , Jing Xia , Orson Zhai , Chunyan Zhang Subject: Re: [PATCH] tracing: Fix crash when it fails to alloc ring buffer Message-ID: <20171226112224.216191dc@gandalf.local.home> In-Reply-To: <20171226071253.8968-1-chunyan.zhang@spreadtrum.com> References: <20171226071253.8968-1-chunyan.zhang@spreadtrum.com> X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2004 Lines: 58 On Tue, 26 Dec 2017 15:12:53 +0800 Chunyan Zhang wrote: > From: Jing Xia > > Double free of the ring buffer happens when it fails to alloc new > ring buffer instance for max_buffer if TRACER_MAX_TRACE is configured. > The root cause is that the pointer is not set to NULL after the buffer > is freed in allocate_trace_buffers(), and the freeing of the ring > buffer is invoked again later if the pointer is not equal to Null, > as: > > instance_mkdir() > |-allocate_trace_buffers() > |-allocate_trace_buffer(tr, &tr->trace_buffer...) > |-allocate_trace_buffer(tr, &tr->max_buffer...) > > // allocate fail(-ENOMEM),first free > // and the buffer pointer is not set to null > |-ring_buffer_free(tr->trace_buffer.buffer) > > // out_free_tr > |-free_trace_buffers() > |-free_trace_buffer(&tr->trace_buffer); > > //if trace_buffer is not null, free again > |-ring_buffer_free(buf->buffer) > |-rb_free_cpu_buffer(buffer->buffers[cpu]) > // ring_buffer_per_cpu is null, and > // crash in ring_buffer_per_cpu->pages > > Signed-off-by: Jing Xia > Signed-off-by: Chunyan Zhang Thanks! I'll apply this to my tree and start testing it. -- Steve > --- > kernel/trace/trace.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c > index 73e67b6..ed1c0d1 100644 > --- a/kernel/trace/trace.c > +++ b/kernel/trace/trace.c > @@ -7622,7 +7622,9 @@ static int allocate_trace_buffers(struct trace_array *tr, int size) > allocate_snapshot ? size : 1); > if (WARN_ON(ret)) { > ring_buffer_free(tr->trace_buffer.buffer); > + tr->trace_buffer.buffer = NULL; > free_percpu(tr->trace_buffer.data); > + tr->trace_buffer.data = NULL; > return -ENOMEM; > } > tr->allocated_snapshot = allocate_snapshot;