From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754709AbdJPQ5F (ORCPT ); Mon, 16 Oct 2017 12:57:05 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:49385 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753171AbdJPQ4R (ORCPT ); Mon, 16 Oct 2017 12:56:17 -0400 X-ME-Sender: From: Michael Sartain To: Steven Rostedt Cc: Michael Sartain , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/4] trace-cmd: Fix NULL pointer being passed to memcpy Date: Mon, 16 Oct 2017 10:55:40 -0600 Message-Id: <20171016165542.13038-3-mikesart@fastmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171016165542.13038-1-mikesart@fastmail.com> References: <20171016165542.13038-1-mikesart@fastmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Michael Sartain --- 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