Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Message-ID: <5643a1971831ce2d01a947f0f07cefa002bbdc25.camel@linux.intel.com>
Subject: Re: [PATCH 2/2] tracing: Use strncpy instead of memcpy for string
 keys in hist triggers
From:   Tom Zanussi <tom.zanussi@linux.intel.com>
To:     Steven Rostedt <rostedt@goodmis.org>,
        Tom Zanussi <zanussi@kernel.org>
Cc:     linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org,
        Namhyung Kim <namhyung@kernel.org>
Date:   Mon, 04 Mar 2019 16:22:52 -0600
In-Reply-To: <20190304165653.17699f9f@gandalf.local.home>
References: <cover.1549309756.git.tom.zanussi@linux.intel.com>
         <50c35ae1267d64eee975b8125e151e600071d4dc.1549309756.git.tom.zanussi@linux.intel.com>
         <20190304165000.0ce0fbdd@gandalf.local.home>
         <20190304165653.17699f9f@gandalf.local.home>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi Steve,

On Mon, 2019-03-04 at 16:56 -0500, Steven Rostedt wrote:
> On Mon, 4 Mar 2019 16:50:00 -0500
> Steven Rostedt <rostedt@goodmis.org> wrote:
> 
> > > +++ b/kernel/trace/trace_events_hist.c
> > > @@ -4695,9 +4695,10 @@ static inline void add_to_key(char
> > > *compound_key, void *key,
> > >  		/* ensure NULL-termination */
> > >  		if (size > key_field->size - 1)
> > >  			size = key_field->size - 1;
> > > -	}
> > >  
> > > -	memcpy(compound_key + key_field->offset, key, size);
> > > +		strncpy(compound_key + key_field->offset, (char *)key,
> > > size);
> > > +	} else
> > > +		memcpy(compound_key + key_field->offset, key, size);
> > >  }
> > >    
> > 
> > Shouldn't we use strncpy() in save_comm() too. Feels safer.
> 
> Note, if that is changed, it can be another patch. This one is fine
> as
> is. I just was looking at other use cases of memcpy() in that file.
> 

Hmm, I don't think it's really necessary - it's not used in a key so
don't care about anything after the null, and TASK_COMM_LEN is used in
the memcpy.

Tom

> -- Steve