From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760740AbZLJHul (ORCPT ); Thu, 10 Dec 2009 02:50:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760733AbZLJHuh (ORCPT ); Thu, 10 Dec 2009 02:50:37 -0500 Received: from hera.kernel.org ([140.211.167.34]:46525 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760725AbZLJHub (ORCPT ); Thu, 10 Dec 2009 02:50:31 -0500 Date: Thu, 10 Dec 2009 07:50:16 GMT From: tip-bot for Julia Lawall Cc: linux-kernel@vger.kernel.org, paulus@samba.org, julia@diku.dk, hpa@zytor.com, mingo@redhat.com, a.p.zijlstra@chello.nl, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, julia@diku.dk, paulus@samba.org, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, tglx@linutronix.de, mingo@elte.hu In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Correct size given to memset Message-ID: Git-Commit-ID: 5660ce34241ab204bf78fbcaa5e09318c2748d37 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5660ce34241ab204bf78fbcaa5e09318c2748d37 Gitweb: http://git.kernel.org/tip/5660ce34241ab204bf78fbcaa5e09318c2748d37 Author: Julia Lawall AuthorDate: Wed, 9 Dec 2009 20:26:18 +0100 Committer: Ingo Molnar CommitDate: Thu, 10 Dec 2009 08:30:26 +0100 perf tools: Correct size given to memset Memset should be given the size of the structure, not the size of the pointer. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ type T; T *x; expression E; @@ memset(x, E, sizeof( + * x)) // Signed-off-by: Julia Lawall Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: Signed-off-by: Ingo Molnar --- tools/perf/util/probe-event.c | 2 +- tools/perf/util/trace-event-parse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 9480d99..d14a458 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -376,7 +376,7 @@ static void clear_probe_point(struct probe_point *pp) free(pp->args); for (i = 0; i < pp->found; i++) free(pp->probes[i]); - memset(pp, 0, sizeof(pp)); + memset(pp, 0, sizeof(*pp)); } /* Show an event */ diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index 6ffe9d6..c5c32be 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -1477,7 +1477,7 @@ process_fields(struct event *event, struct print_flag_sym **list, char **tok) goto out_free; field = malloc_or_die(sizeof(*field)); - memset(field, 0, sizeof(field)); + memset(field, 0, sizeof(*field)); value = arg_eval(arg); field->value = strdup(value);