Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753691AbbDHM4i (ORCPT ); Wed, 8 Apr 2015 08:56:38 -0400 Received: from mail.kernel.org ([198.145.29.136]:46640 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753057AbbDHM4g (ORCPT ); Wed, 8 Apr 2015 08:56:36 -0400 Date: Wed, 8 Apr 2015 09:56:38 -0300 From: Arnaldo Carvalho de Melo To: Wang Nan Cc: jolsa@kernel.org, jolsa@redhat.com, adrian.hunter@intel.com, mingo@redhat.com, lizefan@huawei.com, linux-kernel@vger.kernel.org, pi3orama@163.com Subject: Re: [PATCH] perf: report: don't call map__kmap if map is NULL. Message-ID: <20150408125638.GE26501@kernel.org> References: <1428490772-135393-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1428490772-135393-1-git-send-email-wangnan0@huawei.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1464 Lines: 34 Em Wed, Apr 08, 2015 at 10:59:32AM +0000, Wang Nan escreveu: > report__warn_kptr_restrict() calls map__kmap(kernel_map) before > checking kernel_map againest NULL. Which is dangerous, since > map__kmap() will return a invalid and not NULL address. It will trigger > a warning message in map__kmap() after patch "perf: kmaps: enforce > usage of kmaps to protect futher bugs." > > This patch fixes it by adding the missing checking. > > Signed-off-by: Wang Nan > --- > tools/perf/builtin-report.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c > index b5b2ad4..476cdf7 100644 > --- a/tools/perf/builtin-report.c > +++ b/tools/perf/builtin-report.c > @@ -347,7 +347,7 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist, > static void report__warn_kptr_restrict(const struct report *rep) > { > struct map *kernel_map = rep->session->machines.host.vmlinux_maps[MAP__FUNCTION]; > - struct kmap *kernel_kmap = map__kmap(kernel_map); > + struct kmap *kernel_kmap = kernel_map ? map__kmap(kernel_map) : NULL; > > if (kernel_map == NULL || > (kernel_map->dso->hit && Thanks, applied. -- 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/