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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 6965AC433DF for ; Mon, 24 Aug 2020 17:20:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38B822067C for ; Mon, 24 Aug 2020 17:20:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598289613; bh=1r9Nwm+fHZWNLsNiNhca3Aszj5TIiU+51K/LKn1Uz5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LBXBrHqwtgq7vjYG19VqWcHN6J2hkBdRdcyEQRFFMmG3cSgT040Dt5GZ/j+o9Rr7l 3uLqbsdR89sPcS6yEvqAQHBDNpFHKJ4UgKaHmdILth20JEL8o7opYygoUzl5F7pOIA YesKJoOfIfAeSkgWbCUDA5DFULfsRaBsX9CiDBAI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728492AbgHXRUL (ORCPT ); Mon, 24 Aug 2020 13:20:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:41428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728341AbgHXQgj (ORCPT ); Mon, 24 Aug 2020 12:36:39 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3C40A22CB3; Mon, 24 Aug 2020 16:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598286987; bh=1r9Nwm+fHZWNLsNiNhca3Aszj5TIiU+51K/LKn1Uz5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=saloeLGZdC+qCI/wJkniCVsPfP46DPTAyRY2h+vzr7Beujnnxqbz34DWPjp6VqJ7l kp2oGhup3TkPIOlKbtoiR2t8UCLlQdg8cWhLB4QfZ7QYeU+ZPZ0GfBNjeiFdnbHjwk GhgclZomOnQhzhC0B/phDQGlXcIx+FMBVOJBVxko= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Daniel Borkmann , Yonghong Song , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.8 60/63] libbpf: Fix map index used in error message Date: Mon, 24 Aug 2020 12:35:00 -0400 Message-Id: <20200824163504.605538-60-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200824163504.605538-1-sashal@kernel.org> References: <20200824163504.605538-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Toke Høiland-Jørgensen [ Upstream commit 1e891e513e16c145cc9b45b1fdb8bf4a4f2f9557 ] The error message emitted by bpf_object__init_user_btf_maps() was using the wrong section ID. Signed-off-by: Toke Høiland-Jørgensen Signed-off-by: Daniel Borkmann Acked-by: Yonghong Song Link: https://lore.kernel.org/bpf/20200819110534.9058-1-toke@redhat.com Signed-off-by: Sasha Levin --- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index e8e88c1ab69de..dd89cbc1acd7b 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -2237,7 +2237,7 @@ static int bpf_object__init_user_btf_maps(struct bpf_object *obj, bool strict, data = elf_getdata(scn, NULL); if (!scn || !data) { pr_warn("failed to get Elf_Data from map section %d (%s)\n", - obj->efile.maps_shndx, MAPS_ELF_SEC); + obj->efile.btf_maps_shndx, MAPS_ELF_SEC); return -EINVAL; } -- 2.25.1