Linux-Trace-Devel Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] tools lib traceevent: Fix buffer overflow in arg_eval
@ 2019-08-07 12:14 Tzvetomir Stoyanov (VMware)
  0 siblings, 0 replies; 4+ messages in thread
From: Tzvetomir Stoyanov (VMware) @ 2019-08-07 12:14 UTC (permalink / raw)
  To: rostedt; +Cc: linux-trace-devel

From: Tony Jones <tonyj@suse.de>

Fix buffer overflow observed when running perf test.

The overflow is when trying to evaluate "1ULL << (64 - 1)" which is
resulting in -9223372036854775808 which overflows the 20 character
buffer.

If is possible this bug has been reported before but I still don't see
any fix checked in:

See: https://www.spinics.net/lists/linux-perf-users/msg07714.html

Reported-by: Michael Sartain <mikesart@fastmail.com>
Reported-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Tony Jones <tonyj@suse.de>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Fixes: f7d82350e597 ("tools/events: Add files to create libtraceevent.a")
Link: http://lkml.kernel.org/r/20190228015532.8941-1-tonyj@suse.de
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
[
  Backport from kernel into the trace-cmd repo.
]

 lib/traceevent/event-parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/traceevent/event-parse.c b/lib/traceevent/event-parse.c
index 7cb2ae4..b36b536 100644
--- a/lib/traceevent/event-parse.c
+++ b/lib/traceevent/event-parse.c
@@ -2456,7 +2456,7 @@ static int arg_num_eval(struct tep_print_arg *arg, long long *val)
 static char *arg_eval (struct tep_print_arg *arg)
 {
 	long long val;
-	static char buf[20];
+	static char buf[24];
 
 	switch (arg->type) {
 	case TEP_PRINT_ATOM:
-- 
2.21.0


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] tools lib traceevent: Fix buffer overflow in arg_eval
  2019-02-28 19:01   ` Arnaldo Carvalho de Melo
@ 2019-02-28 19:07     ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-02-28 19:07 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Tony Jones, linux-kernel, Arnaldo Carvalho de Melo,
	linux-perf-users, Mathias Krause, linux-trace-devel,
	Tzvetomir Stoyanov, Michael Sartain

Em Thu, Feb 28, 2019 at 04:01:23PM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Wed, Feb 27, 2019 at 10:12:50PM -0500, Steven Rostedt escreveu:
> > On Wed, 27 Feb 2019 17:55:32 -0800
> > Tony Jones <tonyj@suse.de> wrote:
> > 
> > > Fix buffer overflow observed when running perf test.
> > > 
> > > The overflow is when trying to evaluate "1ULL << (64 - 1)" which
> > > is resulting in -9223372036854775808 which overflows the 20 character
> > > buffer.
> > > 
> > > If is possible this bug has been reported before but I still don't
> > > see any fix checked in:
> > > 
> > > See: https://www.spinics.net/lists/linux-perf-users/msg07714.html
> > > 
> > > Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> > > Cc: linux-perf-users@vger.kernel.org
> > > Cc: Steven Rostedt <rostedt@goodmis.org>
> > > Signed-off-by: Tony Jones <tonyj@suse.de>
> > 
> > Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> > 
> > I have to say I've let this slide and it is not the first time a patch
> > went out with this fix. But this one has the correct fix because we
> > should use a buffer with a multiple of 4. Anyway, Tony I believe was
> > the first to report this anyway.
> > 
> > For reference we have:
> > 
> > I first heard about Tony's complaint on a post to linux-perf-users on Jan 18.
> > 
> > But then we had after that:
> > 
> >  Michael Sartain reported it on 1/24 (and fixed by Tzvetomir)
> >  https://lore.kernel.org/linux-trace-devel/20190125102014.19600-1-tstoyanov@vmware.com/
> >  
> > It was later fixed again by Mathias Krause
> >  https://lore.kernel.org/linux-trace-devel/20190223122404.21137-1-minipli@googlemail.com/
> > 
> > But since Tony was first to report it, and we discussed that it should
> > be 24 bytes, I would say this is the patch to take.
> > 
> > Again, sorry for not getting this acknowledged earlier and everyone doing
> > the same thing multiple times. :-/
> > 
> > Arnaldo, please take this patch. But also add:
> > 
> > Reported-by: Michael Sartain <mikesart@fastmail.com>
> > Reported-by: Mathias Krause <minipli@googlemail.com>
> 
> Will do.
> 
> Thanks for the credit research,

Some more research, an approximation, adding:

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Fixes: f7d82350e597 ("tools/events: Add files to create libtraceevent.a")

That is the 'git blame' entry for when that line was added with sizeof
== 20

- Arnaldo

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] tools lib traceevent: Fix buffer overflow in arg_eval
  2019-02-28  3:12 ` Steven Rostedt
@ 2019-02-28 19:01   ` Arnaldo Carvalho de Melo
  2019-02-28 19:07     ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-02-28 19:01 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Tony Jones, linux-kernel, Arnaldo Carvalho de Melo,
	linux-perf-users, Mathias Krause, linux-trace-devel,
	Tzvetomir Stoyanov, Michael Sartain

Em Wed, Feb 27, 2019 at 10:12:50PM -0500, Steven Rostedt escreveu:
> On Wed, 27 Feb 2019 17:55:32 -0800
> Tony Jones <tonyj@suse.de> wrote:
> 
> > Fix buffer overflow observed when running perf test.
> > 
> > The overflow is when trying to evaluate "1ULL << (64 - 1)" which
> > is resulting in -9223372036854775808 which overflows the 20 character
> > buffer.
> > 
> > If is possible this bug has been reported before but I still don't
> > see any fix checked in:
> > 
> > See: https://www.spinics.net/lists/linux-perf-users/msg07714.html
> > 
> > Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> > Cc: linux-perf-users@vger.kernel.org
> > Cc: Steven Rostedt <rostedt@goodmis.org>
> > Signed-off-by: Tony Jones <tonyj@suse.de>
> 
> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> 
> I have to say I've let this slide and it is not the first time a patch
> went out with this fix. But this one has the correct fix because we
> should use a buffer with a multiple of 4. Anyway, Tony I believe was
> the first to report this anyway.
> 
> For reference we have:
> 
> I first heard about Tony's complaint on a post to linux-perf-users on Jan 18.
> 
> But then we had after that:
> 
>  Michael Sartain reported it on 1/24 (and fixed by Tzvetomir)
>  https://lore.kernel.org/linux-trace-devel/20190125102014.19600-1-tstoyanov@vmware.com/
>  
> It was later fixed again by Mathias Krause
>  https://lore.kernel.org/linux-trace-devel/20190223122404.21137-1-minipli@googlemail.com/
> 
> But since Tony was first to report it, and we discussed that it should
> be 24 bytes, I would say this is the patch to take.
> 
> Again, sorry for not getting this acknowledged earlier and everyone doing
> the same thing multiple times. :-/
> 
> Arnaldo, please take this patch. But also add:
> 
> Reported-by: Michael Sartain <mikesart@fastmail.com>
> Reported-by: Mathias Krause <minipli@googlemail.com>

Will do.

Thanks for the credit research,

- Arnaldo

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] tools lib traceevent: Fix buffer overflow in arg_eval
       [not found] <20190228015532.8941-1-tonyj@suse.de>
@ 2019-02-28  3:12 ` Steven Rostedt
  2019-02-28 19:01   ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 4+ messages in thread
From: Steven Rostedt @ 2019-02-28  3:12 UTC (permalink / raw)
  To: Tony Jones
  Cc: linux-kernel, Arnaldo Carvalho de Melo, linux-perf-users,
	Mathias Krause, linux-trace-devel, Tzvetomir Stoyanov,
	Michael Sartain

On Wed, 27 Feb 2019 17:55:32 -0800
Tony Jones <tonyj@suse.de> wrote:

> Fix buffer overflow observed when running perf test.
> 
> The overflow is when trying to evaluate "1ULL << (64 - 1)" which
> is resulting in -9223372036854775808 which overflows the 20 character
> buffer.
> 
> If is possible this bug has been reported before but I still don't
> see any fix checked in:
> 
> See: https://www.spinics.net/lists/linux-perf-users/msg07714.html
> 
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: linux-perf-users@vger.kernel.org
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Signed-off-by: Tony Jones <tonyj@suse.de>

Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

I have to say I've let this slide and it is not the first time a patch
went out with this fix. But this one has the correct fix because we
should use a buffer with a multiple of 4. Anyway, Tony I believe was
the first to report this anyway.

For reference we have:

I first heard about Tony's complaint on a post to linux-perf-users on Jan 18.

But then we had after that:

 Michael Sartain reported it on 1/24 (and fixed by Tzvetomir)
 https://lore.kernel.org/linux-trace-devel/20190125102014.19600-1-tstoyanov@vmware.com/
 
It was later fixed again by Mathias Krause
 https://lore.kernel.org/linux-trace-devel/20190223122404.21137-1-minipli@googlemail.com/

But since Tony was first to report it, and we discussed that it should
be 24 bytes, I would say this is the patch to take.

Again, sorry for not getting this acknowledged earlier and everyone doing
the same thing multiple times. :-/

Arnaldo, please take this patch. But also add:

Reported-by: Michael Sartain <mikesart@fastmail.com>
Reported-by: Mathias Krause <minipli@googlemail.com>

Thanks,

-- Steve


> ---
>  tools/lib/traceevent/event-parse.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/lib/traceevent/event-parse.c
> b/tools/lib/traceevent/event-parse.c index abd4fa5d3088..87494c7c619d
> 100644 --- a/tools/lib/traceevent/event-parse.c
> +++ b/tools/lib/traceevent/event-parse.c
> @@ -2457,7 +2457,7 @@ static int arg_num_eval(struct tep_print_arg
> *arg, long long *val) static char *arg_eval (struct tep_print_arg
> *arg) {
>  	long long val;
> -	static char buf[20];
> +	static char buf[24];
>  
>  	switch (arg->type) {
>  	case TEP_PRINT_ATOM:


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-07 12:14 [PATCH] tools lib traceevent: Fix buffer overflow in arg_eval Tzvetomir Stoyanov (VMware)
     [not found] <20190228015532.8941-1-tonyj@suse.de>
2019-02-28  3:12 ` Steven Rostedt
2019-02-28 19:01   ` Arnaldo Carvalho de Melo
2019-02-28 19:07     ` Arnaldo Carvalho de Melo

Linux-Trace-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-trace-devel/0 linux-trace-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-trace-devel linux-trace-devel/ https://lore.kernel.org/linux-trace-devel \
		linux-trace-devel@vger.kernel.org linux-trace-devel@archiver.kernel.org
	public-inbox-index linux-trace-devel


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-trace-devel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox