Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755659Ab3HANdX (ORCPT ); Thu, 1 Aug 2013 09:33:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1337 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755217Ab3HANdW (ORCPT ); Thu, 1 Aug 2013 09:33:22 -0400 Date: Thu, 1 Aug 2013 15:29:34 +0200 From: Jiri Olsa To: Frederic Weisbecker Cc: Peter Zijlstra , LKML , Namhyung Kim , Ingo Molnar , Arnaldo Carvalho de Melo , Stephane Eranian Subject: Re: [PATCH 2/8] perf: Sanitize get_callchain_buffer() Message-ID: <20130801132934.GG1032@krava.brq.redhat.com> References: <1374539466-4799-1-git-send-email-fweisbec@gmail.com> <1374539466-4799-3-git-send-email-fweisbec@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1374539466-4799-3-git-send-email-fweisbec@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1024 Lines: 39 On Tue, Jul 23, 2013 at 02:31:00AM +0200, Frederic Weisbecker wrote: SNIP > if (event->attach_state & PERF_ATTACH_TASK) > static_key_slow_inc(&perf_sched_events.key); > if (event->attr.mmap || event->attr.mmap_data) > @@ -6572,16 +6570,19 @@ done: > atomic_inc(&per_cpu(perf_branch_stack_events, > event->cpu)); > } > - if (event->attr.sample_type & PERF_SAMPLE_CALLCHAIN) { > - err = get_callchain_buffers(); > - if (err) { > - free_event(event); > - return ERR_PTR(err); > - } > - } > } > > return event; > + > +err_pmu: > + if (event->destroy) > + event->destroy(event); > +err_ns: > + if (event->ns) > + put_pid_ns(event->ns); > + kfree(event); > + > + return ERR_PTR(err); could we call __free_filter(event) here? jirka -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/