lkml.org 
[lkml]   [2017]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 2/4] trace-cmd: Fix NULL pointer being passed to memcpy
Date
Signed-off-by: Michael Sartain <mikesart@fastmail.com>
---
trace-output.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/trace-output.c b/trace-output.c
index bfe6331..bbb1637 100644
--- a/trace-output.c
+++ b/trace-output.c
@@ -929,7 +929,11 @@ tracecmd_add_option(struct tracecmd_output *handle,
free(option);
return NULL;
}
- memcpy(option->data, data, size);
+
+ /* Some IDs (like TRACECMD_OPTION_TRACECLOCK) pass 0 / NULL data */
+ if (size)
+ memcpy(option->data, data, size);
+
list_add_tail(&option->list, &handle->options);

return option;
--
2.14.2
\
 
 \ /
  Last update: 2017-10-16 18:57    [W:0.051 / U:0.520 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site