Date: Thu, 1 Aug 2013 15:51:02 +0200
From: Jiri Olsa <jolsa@redhat.com>
To: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>, LKML <linux-kernel@vger.kernel.org>,
        Namhyung Kim <namhyung@kernel.org>, Ingo Molnar <mingo@kernel.org>,
        Arnaldo Carvalho de Melo <acme@redhat.com>,
        Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH 2/8] perf: Sanitize get_callchain_buffer()
Message-ID: <20130801135102.GJ1032@krava.brq.redhat.com>
References: <1374539466-4799-1-git-send-email-fweisbec@gmail.com>
 <1374539466-4799-3-git-send-email-fweisbec@gmail.com>
 <20130801132934.GG1032@krava.brq.redhat.com>
 <20130801134226.GC431@somewhere>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20130801134226.GC431@somewhere>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1625
Lines: 51

On Thu, Aug 01, 2013 at 03:42:28PM +0200, Frederic Weisbecker wrote:
> On Thu, Aug 01, 2013 at 03:29:34PM +0200, Jiri Olsa wrote:
> > 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?
> 
> Hmm, the filters are installed from ioctl time so there shouldn't be any yet. But there should be
> an exception with inherited events. I fail to find where the filter is inherited though. Do
> we actually inherit those?

ouch.. last I checked was freeing filter before writing this... :)

what I meant was the __free_event(event)

sorry

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/