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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79A1CC19F2A for ; Thu, 11 Aug 2022 15:46:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236551AbiHKPqm (ORCPT ); Thu, 11 Aug 2022 11:46:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236248AbiHKPpT (ORCPT ); Thu, 11 Aug 2022 11:45:19 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12E1785AB2; Thu, 11 Aug 2022 08:39:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A44896165E; Thu, 11 Aug 2022 15:39:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DDEBFC433C1; Thu, 11 Aug 2022 15:39:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660232374; bh=zhl/sG1HuGjIn4wKTaffZ5Mcx2QihFUIsjJoG8g1RQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UtJqpKPV1Y0Y/BKPSJtuoHVtXCroX0faV43F8wadjADoxN/GQ4rRHQK5YZwPNyCwn z+nmhpc7WTRuUgpdhi9CCg6BT/a/C6OsqCCVceebFuFZv0aB/1DCC33gAUT1AJ+rIC y6jmyDZA3dt44e1C7tsqMdbJCxyaO6cf6UHRUJD6Wyk400ysocPy1sHmeWnumLpxGa 0q6RyA0RE3UWawwMFdekDul3niD7XDh15Hp+W4JsqnY6WFEjQzhEedlUsdWpLbY3CD WuQPHEigZYC6NifZ+aECGtJUjC23ZZJcts/e8tw63t49I8b3CH8bE2QcBARG6jM7s0 8hRyTwACgzYog== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ben Dooks , Andrii Nakryiko , Yonghong Song , Sasha Levin , martin.lau@linux.dev, ast@kernel.org, daniel@iogearbox.net, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.19 073/105] bpf: Fix check against plain integer v 'NULL' Date: Thu, 11 Aug 2022 11:27:57 -0400 Message-Id: <20220811152851.1520029-73-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220811152851.1520029-1-sashal@kernel.org> References: <20220811152851.1520029-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ben Dooks [ Upstream commit a2a5580fcbf808e7c2310e4959b62f9d2157fdb6 ] When checking with sparse, btf_show_type_value() is causing a warning about checking integer vs NULL when the macro is passed a pointer, due to the 'value != 0' check. Stop sparse complaining about any type-casting by adding a cast to the typeof(value). This fixes the following sparse warnings: kernel/bpf/btf.c:2579:17: warning: Using plain integer as NULL pointer kernel/bpf/btf.c:2581:17: warning: Using plain integer as NULL pointer kernel/bpf/btf.c:3407:17: warning: Using plain integer as NULL pointer kernel/bpf/btf.c:3758:9: warning: Using plain integer as NULL pointer Signed-off-by: Ben Dooks Signed-off-by: Andrii Nakryiko Acked-by: Yonghong Song Link: https://lore.kernel.org/bpf/20220714100322.260467-1-ben.dooks@sifive.com Signed-off-by: Sasha Levin --- kernel/bpf/btf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index eb12d4f705cc..9a6e5f71bbd2 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -1108,7 +1108,8 @@ __printf(2, 3) static void btf_show(struct btf_show *show, const char *fmt, ...) */ #define btf_show_type_value(show, fmt, value) \ do { \ - if ((value) != 0 || (show->flags & BTF_SHOW_ZERO) || \ + if ((value) != (__typeof__(value))0 || \ + (show->flags & BTF_SHOW_ZERO) || \ show->state.depth == 0) { \ btf_show(show, "%s%s" fmt "%s%s", \ btf_show_indent(show), \ -- 2.35.1