From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93B0FC282DA for ; Wed, 17 Apr 2019 14:55:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D9A72183F for ; Wed, 17 Apr 2019 14:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555512944; bh=j9k/mzqnrZNzZ7Si59lWNOFs2wbvVmUBj3UwXe/aI5E=; h=From:To:Cc:Subject:Date:List-ID:From; b=oxes5yIsQiB6x9kKpfJJUeBwadWDTC2chn6urk/IHJQu1KCM6YgjpUfaFzlb5ulrn VZXLox48VVOExYGnAVViQLWsKIgfw4Cm/i4y+dX28nDQAeS1v9R6zQoZ4m7KXFE/B5 Ofz7x4y+IAkjrplrT8VJxDzo+TpOREsGCZw5iE4k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732415AbfDQOzn (ORCPT ); Wed, 17 Apr 2019 10:55:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39792 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732268AbfDQOzm (ORCPT ); Wed, 17 Apr 2019 10:55:42 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C10077DCE6; Wed, 17 Apr 2019 14:55:42 +0000 (UTC) Received: from krava.brq.redhat.com (unknown [10.43.17.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA92A5D6A6; Wed, 17 Apr 2019 14:55:39 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: Alexander Shishkin , Namhyung Kim , Peter Zijlstra , Song Liu , lkml , Ingo Molnar , Peter Zijlstra Subject: [PATCH] perf bpf: Return NULL when RB tree lookup fails in perf_env__find_btf() Date: Wed, 17 Apr 2019 16:55:39 +0200 Message-Id: <20190417145539.11669-1-jolsa@kernel.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 17 Apr 2019 14:55:42 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We currently don't return NULL in case we don't find the bpf_prog_info_node, fixing that. Signed-off-by: Jiri Olsa Cc: Alexander Shishkin Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Song Liu Fixes: 3792cb2ff43b ("perf bpf: Save BTF in a rbtree in perf_env") Link: http://lkml.kernel.org/n/tip-99g9rg4p20a1o99vr0nkjhq8@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/env.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index 34a363f2e71b..9494f9dc61ec 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -111,10 +111,12 @@ struct btf_node *perf_env__find_btf(struct perf_env *env, __u32 btf_id) else if (btf_id > node->id) n = n->rb_right; else - break; + goto out; } + node = NULL; up_read(&env->bpf_progs.lock); +out: return node; } -- 2.17.2