From: Michael Sartain <mikesart@fastmail.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Michael Sartain <mikesart@fastmail.com>, linux-kernel@vger.kernel.org
Subject: [PATCH 2/5] trace-cmd: Fix NULL pointer being passed to memcpy
Date: Sat, 12 Aug 2017 11:30:44 -0600 [thread overview]
Message-ID: <20170812173047.840-3-mikesart@fastmail.com> (raw)
In-Reply-To: <20170812173047.840-1-mikesart@fastmail.com>
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..84b21b0 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 NULL data */
+ if (data)
+ memcpy(option->data, data, size);
+
list_add_tail(&option->list, &handle->options);
return option;
--
2.13.2
next prev parent reply other threads:[~2017-08-12 17:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-12 17:30 [PATCH 0/5] trace-cmd: Fixes for four small bugs plus minor cleanup Michael Sartain
2017-08-12 17:30 ` [PATCH 1/5] trace-cmd: Fix incorrect malloc size arg: *item instead of item Michael Sartain
2017-08-12 17:30 ` Michael Sartain [this message]
2017-10-09 22:24 ` [PATCH 2/5] trace-cmd: Fix NULL pointer being passed to memcpy Steven Rostedt
2017-10-09 22:27 ` Michael Sartain
2017-10-09 22:33 ` Steven Rostedt
2017-08-12 17:30 ` [PATCH 3/5] trace-cmd: Add ULL suffix to MISSING_EVENTS since ints shouldn't be left shifted by 31 Michael Sartain
2017-10-09 22:27 ` Steven Rostedt
2017-08-12 17:30 ` [PATCH 4/5] trace-cmd: Use unsigned values in Hsieh's trace_hash fast hash function Michael Sartain
2017-10-09 22:30 ` Steven Rostedt
2017-08-12 17:30 ` [PATCH 5/5] trace-cmd: Remove unused view_width variable Michael Sartain
2017-10-09 22:32 ` Steven Rostedt
2017-10-09 22:13 ` [PATCH 0/5] trace-cmd: Fixes for four small bugs plus minor cleanup Michael Sartain
2017-10-09 22:21 ` Steven Rostedt
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=20170812173047.840-3-mikesart@fastmail.com \
--to=mikesart@fastmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®