LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Tom Zanussi <zanussi@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>,
	LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Masami Hiramatsu <mhiramat@kernel.org>
Subject: Re: [PATCH] tracing / histogram: Fix NULL pointer dereference on strcmp() on NULL event name
Date: Wed, 11 Aug 2021 10:29:10 -0500	[thread overview]
Message-ID: <934b0ae20a78f87b556d0dfd150282f033bc1483.camel@kernel.org> (raw)
In-Reply-To: <20210811103522.0cac5f1a@oasis.local.home>

Hi Steve,

On Wed, 2021-08-11 at 10:35 -0400, Steven Rostedt wrote:
> On Sun, 8 Aug 2021 00:30:11 -0400
> Steven Rostedt <rostedt@goodmis.org> wrote:
> 
> > diff --git a/kernel/trace/trace_events_hist.c
> > b/kernel/trace/trace_events_hist.c
> > index 949ef09dc537..a48aa2a2875b 100644
> > --- a/kernel/trace/trace_events_hist.c
> > +++ b/kernel/trace/trace_events_hist.c
> > @@ -3430,6 +3430,8 @@ trace_action_create_field_var(struct
> > hist_trigger_data *hist_data,
> >  			event = data->match_data.event;
> >  		}
> >  
> > +		if (!event)
> > +			goto free;
> >  		/*
> >  		 * At this point, we're looking at a field on another
> >  		 * event.  Because we can't modify a hist trigger on
> > -- 
> 
> Tom,
> 
> Is this OK? I'm going to start running this through my tests and when
> it's done, I'm going to send it off to Linus.

Sorry, missed this one.

But yeah, this fixes the problem, thanks!

Reviewed-by: Tom Zanussi <zanussi@kernel.org>


> 
> -- Steve


      reply	other threads:[~2021-08-11 15:29 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-08  4:30 Steven Rostedt
2021-08-11 14:35 ` Steven Rostedt
2021-08-11 15:29   ` Tom Zanussi [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=934b0ae20a78f87b556d0dfd150282f033bc1483.camel@kernel.org \
    --to=zanussi@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@kernel.org \
    --cc=rostedt@goodmis.org \
    --subject='Re: [PATCH] tracing / histogram: Fix NULL pointer dereference on strcmp() on NULL event name' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).