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=-10.1 required=3.0 tests=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 5647AC2D0DB for ; Fri, 24 Jan 2020 14:36:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28C2F20838 for ; Fri, 24 Jan 2020 14:36:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579876575; bh=42WkP/Rp3pK4A21HaZqFzJemGQbzr/tGytg8oylj2Yc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=h9uarphgmQ7aqziQvt7NZFxSXqVGWd4o3MFFBBz3Zai3verjobzfGH4P+FseAONn1 P6vE8eEkpIubRat32qdRDZlWvnvhacEWFhL8tb2Hz6DJdwvWLzMCYL5MG8mfzDMTT5 anskQena0dqjyROvGusXmLMQccqWczlC1SoTSPUk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391476AbgAXOTQ (ORCPT ); Fri, 24 Jan 2020 09:19:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:39462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391462AbgAXOTQ (ORCPT ); Fri, 24 Jan 2020 09:19:16 -0500 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 1C39F208C4; Fri, 24 Jan 2020 14:19:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875555; bh=42WkP/Rp3pK4A21HaZqFzJemGQbzr/tGytg8oylj2Yc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QMaQbmP1p+qZ6HkvS0NFOau8Yo+Ojw73EMGx5FdSOQuL30c5sbzXn7dKJU/dcS0hk 1aA1s0x2e0G7SmY+6Cz/cwroYKtM2QRDEzOZm8I48Hge4iAUeh4EnKXbNDDWOJTWl0 kQzP2xfWXm8BhbENzgEAgOHyKXtLzHDHL+NeLmpI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin KaFai Lau , Alexei Starovoitov , Quentin Monnet , Sasha Levin Subject: [PATCH AUTOSEL 5.4 050/107] bpftool: Fix printing incorrect pointer in btf_dump_ptr Date: Fri, 24 Jan 2020 09:17:20 -0500 Message-Id: <20200124141817.28793-50-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200124141817.28793-1-sashal@kernel.org> References: <20200124141817.28793-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Martin KaFai Lau [ Upstream commit 555089fdfc37ad65e0ee9b42ca40c238ff546f83 ] For plain text output, it incorrectly prints the pointer value "void *data". The "void *data" is actually pointing to memory that contains a bpf-map's value. The intention is to print the content of the bpf-map's value instead of printing the pointer pointing to the bpf-map's value. In this case, a member of the bpf-map's value is a pointer type. Thus, it should print the "*(void **)data". Fixes: 22c349e8db89 ("tools: bpftool: fix format strings and arguments for jsonw_printf()") Signed-off-by: Martin KaFai Lau Signed-off-by: Alexei Starovoitov Reviewed-by: Quentin Monnet Link: https://lore.kernel.org/bpf/20200110231644.3484151-1-kafai@fb.com Signed-off-by: Sasha Levin --- tools/bpf/bpftool/btf_dumper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/btf_dumper.c b/tools/bpf/bpftool/btf_dumper.c index d66131f696892..397e5716ab6d8 100644 --- a/tools/bpf/bpftool/btf_dumper.c +++ b/tools/bpf/bpftool/btf_dumper.c @@ -26,7 +26,7 @@ static void btf_dumper_ptr(const void *data, json_writer_t *jw, bool is_plain_text) { if (is_plain_text) - jsonw_printf(jw, "%p", data); + jsonw_printf(jw, "%p", *(void **)data); else jsonw_printf(jw, "%lu", *(unsigned long *)data); } -- 2.20.1