Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932509AbbDHPPm (ORCPT ); Wed, 8 Apr 2015 11:15:42 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40413 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754608AbbDHPPh (ORCPT ); Wed, 8 Apr 2015 11:15:37 -0400 Date: Wed, 8 Apr 2015 08:15:22 -0700 From: tip-bot for Wang Nan Message-ID: Cc: adrian.hunter@intel.com, jolsa@redhat.com, mingo@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, lizefan@huawei.com, hpa@zytor.com, wangnan0@huawei.com Reply-To: mingo@kernel.org, acme@redhat.com, jolsa@redhat.com, adrian.hunter@intel.com, tglx@linutronix.de, lizefan@huawei.com, hpa@zytor.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org In-Reply-To: <1428490772-135393-1-git-send-email-wangnan0@huawei.com> References: <1428490772-135393-1-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf report: Don't call map__kmap if map is NULL. Git-Commit-ID: f6fcc1433a4a9057b2977313f31eadbc1c84268b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Content-Length: 1996 Lines: 49 Commit-ID: f6fcc1433a4a9057b2977313f31eadbc1c84268b Gitweb: http://git.kernel.org/tip/f6fcc1433a4a9057b2977313f31eadbc1c84268b Author: Wang Nan AuthorDate: Wed, 8 Apr 2015 10:59:32 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 8 Apr 2015 11:00:00 -0300 perf report: Don't call map__kmap if map is NULL. 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 the patch "perf: kmaps: enforce usage of kmaps to protect futher bugs." was applied. This patch fixes it by adding the missing checking. Signed-off-by: Wang Nan Cc: Adrian Hunter Cc: Jiri Olsa Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1428490772-135393-1-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- 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 && -- 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/