Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754351AbbLJJZG (ORCPT ); Thu, 10 Dec 2015 04:25:06 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:61370 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752198AbbLJJY7 (ORCPT ); Thu, 10 Dec 2015 04:24:59 -0500 Message-ID: <566944C0.3030005@huawei.com> Date: Thu, 10 Dec 2015 17:24:16 +0800 From: "Wangnan (F)" User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: , , CC: , , , Arnaldo Carvalho de Melo , Namhyung Kim Subject: Re: [PATCH 2/2] perf tools: Prevent calling machine__delete() on non-allocated machine References: <1449726768-79624-1-git-send-email-wangnan0@huawei.com> <1449726768-79624-2-git-send-email-wangnan0@huawei.com> In-Reply-To: <1449726768-79624-2-git-send-email-wangnan0@huawei.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.111.66.109] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.566944D4.00BA,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: bcffd3004fecd22eb8cf7f53dfb323a8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3100 Lines: 84 On 2015/12/10 13:52, Wang Nan wrote: > To prevent futher commits calling machine__delete() on non-allocated > 'struct machine' (which would cause memory corruption), this patch > enforces machine__init(), record whether a machine structure is > dynamically allocated or not, and warn if machine__delete() is called > on incorrect object. > > Signed-off-by: Wang Nan > Cc: Arnaldo Carvalho de Melo > Cc: Jiri Olsa > Cc: Masami Hiramatsu > Cc: Namhyung Kim > --- > tools/perf/tests/vmlinux-kallsyms.c | 4 ++-- > tools/perf/util/machine.c | 14 +++++++++----- > tools/perf/util/machine.h | 3 ++- > 3 files changed, 13 insertions(+), 8 deletions(-) > > diff --git a/tools/perf/tests/vmlinux-kallsyms.c b/tools/perf/tests/vmlinux-kallsyms.c > index f0bfc9e..441e93d 100644 > --- a/tools/perf/tests/vmlinux-kallsyms.c > +++ b/tools/perf/tests/vmlinux-kallsyms.c > @@ -35,8 +35,8 @@ int test__vmlinux_matches_kallsyms(int subtest __maybe_unused) > * Init the machines that will hold kernel, modules obtained from > * both vmlinux + .ko files and from /proc/kallsyms split by modules. > */ > - machine__init(&kallsyms, "", HOST_KERNEL_ID); > - machine__init(&vmlinux, "", HOST_KERNEL_ID); > + machine__init(&kallsyms, "", HOST_KERNEL_ID, false); > + machine__init(&vmlinux, "", HOST_KERNEL_ID, false); > > /* > * Step 2: > diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c > index f5882b8..a2b9b47 100644 > --- a/tools/perf/util/machine.c > +++ b/tools/perf/util/machine.c > @@ -23,7 +23,7 @@ static void dsos__init(struct dsos *dsos) > pthread_rwlock_init(&dsos->lock, NULL); > } > > -int machine__init(struct machine *machine, const char *root_dir, pid_t pid) > +int machine__init(struct machine *machine, const char *root_dir, pid_t pid, bool allocated) > { > map_groups__init(&machine->kmaps, machine); > RB_CLEAR_NODE(&machine->rb_node); > @@ -64,6 +64,7 @@ int machine__init(struct machine *machine, const char *root_dir, pid_t pid) > } > > machine->current_tid = NULL; > + machine->allocated = allocated; > > return 0; > } > @@ -73,7 +74,7 @@ struct machine *machine__new_host(void) > struct machine *machine = malloc(sizeof(*machine)); > > if (machine != NULL) { > - machine__init(machine, "", HOST_KERNEL_ID); > + machine__init(machine, "", HOST_KERNEL_ID, true); > > if (machine__create_kernel_maps(machine) < 0) > goto out_delete; > @@ -136,12 +137,15 @@ void machine__exit(struct machine *machine) > void machine__delete(struct machine *machine) > { > machine__exit(machine); > - free(machine); > + if (!machine->allocated) Sorry, should be if (machine->allocated) Will send v2. Thank you. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/