From nobody Fri Dec 19 17:33:07 2025 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 09569FA373E for ; Sat, 22 Oct 2022 07:55:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232145AbiJVHzu (ORCPT ); Sat, 22 Oct 2022 03:55:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231755AbiJVHwg (ORCPT ); Sat, 22 Oct 2022 03:52:36 -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 170655A140; Sat, 22 Oct 2022 00:46:38 -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 1F4EF60BA3; Sat, 22 Oct 2022 07:44:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D75AC433D6; Sat, 22 Oct 2022 07:44:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424668; bh=N/eEKm28DGri4kRdFiJuk/ocMDA5G7uunqNFPqEF9o8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w4nzGHsBrCX6AqB7B3z8riz9bPqqZ1t7ZuduoCeaAr7ccaFMljzv0BH0JZJAARo3q hU8vkb2QSmF9ump4OhYl7okojCAGdh4OvLNSpwMj/wnLlzZgjrCV7/fyh4ml1fwFVx oyglqkaEdlvSqBK+qZVCB7N9dGbYbkgXed/SRzCA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kernel test robot , Joanne Koong , Daniel Borkmann , Sasha Levin Subject: [PATCH 5.19 202/717] bpf: Fix non-static bpf_func_proto struct definitions Date: Sat, 22 Oct 2022 09:21:21 +0200 Message-Id: <20221022072451.091195507@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Joanne Koong [ Upstream commit dc368e1c658e4f478a45e8d1d5b0c8392ca87506 ] This patch does two things: 1) Marks the dynptr bpf_func_proto structs that were added in [1] as static, as pointed out by the kernel test robot in [2]. 2) There are some bpf_func_proto structs marked as extern which can instead be statically defined. [1] https://lore.kernel.org/bpf/20220523210712.3641569-1-joannelkoong@gma= il.com/ [2] https://lore.kernel.org/bpf/62ab89f2.Pko7sI08RAKdF8R6%25lkp@intel.com/ Reported-by: kernel test robot Signed-off-by: Joanne Koong Signed-off-by: Daniel Borkmann Link: https://lore.kernel.org/bpf/20220616225407.1878436-1-joannelkoong@gma= il.com Stable-dep-of: 883743422ced ("bpf: Fix ref_obj_id for dynptr data slices in= verifier") Signed-off-by: Sasha Levin --- include/linux/bpf.h | 3 --- kernel/bpf/helpers.c | 12 ++++++------ kernel/bpf/syscall.c | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index ed352c00330c..647438166558 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -2273,12 +2273,9 @@ extern const struct bpf_func_proto bpf_for_each_map_= elem_proto; extern const struct bpf_func_proto bpf_btf_find_by_name_kind_proto; extern const struct bpf_func_proto bpf_sk_setsockopt_proto; extern const struct bpf_func_proto bpf_sk_getsockopt_proto; -extern const struct bpf_func_proto bpf_kallsyms_lookup_name_proto; extern const struct bpf_func_proto bpf_find_vma_proto; extern const struct bpf_func_proto bpf_loop_proto; -extern const struct bpf_func_proto bpf_strncmp_proto; extern const struct bpf_func_proto bpf_copy_from_user_task_proto; -extern const struct bpf_func_proto bpf_kptr_xchg_proto; =20 const struct bpf_func_proto *tracing_prog_func_proto( enum bpf_func_id func_id, const struct bpf_prog *prog); diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index fb03f40116eb..ed7649b04704 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -584,7 +584,7 @@ BPF_CALL_3(bpf_strncmp, const char *, s1, u32, s1_sz, c= onst char *, s2) return strncmp(s1, s2, s1_sz); } =20 -const struct bpf_func_proto bpf_strncmp_proto =3D { +static const struct bpf_func_proto bpf_strncmp_proto =3D { .func =3D bpf_strncmp, .gpl_only =3D false, .ret_type =3D RET_INTEGER, @@ -1402,7 +1402,7 @@ BPF_CALL_2(bpf_kptr_xchg, void *, map_value, void *, = ptr) */ #define BPF_PTR_POISON ((void *)((0xeB9FUL << 2) + POISON_POINTER_DELTA)) =20 -const struct bpf_func_proto bpf_kptr_xchg_proto =3D { +static const struct bpf_func_proto bpf_kptr_xchg_proto =3D { .func =3D bpf_kptr_xchg, .gpl_only =3D false, .ret_type =3D RET_PTR_TO_BTF_ID_OR_NULL, @@ -1489,7 +1489,7 @@ BPF_CALL_4(bpf_dynptr_from_mem, void *, data, u32, si= ze, u64, flags, struct bpf_ return err; } =20 -const struct bpf_func_proto bpf_dynptr_from_mem_proto =3D { +static const struct bpf_func_proto bpf_dynptr_from_mem_proto =3D { .func =3D bpf_dynptr_from_mem, .gpl_only =3D false, .ret_type =3D RET_INTEGER, @@ -1516,7 +1516,7 @@ BPF_CALL_5(bpf_dynptr_read, void *, dst, u32, len, st= ruct bpf_dynptr_kern *, src return 0; } =20 -const struct bpf_func_proto bpf_dynptr_read_proto =3D { +static const struct bpf_func_proto bpf_dynptr_read_proto =3D { .func =3D bpf_dynptr_read, .gpl_only =3D false, .ret_type =3D RET_INTEGER, @@ -1544,7 +1544,7 @@ BPF_CALL_5(bpf_dynptr_write, struct bpf_dynptr_kern *= , dst, u32, offset, void *, return 0; } =20 -const struct bpf_func_proto bpf_dynptr_write_proto =3D { +static const struct bpf_func_proto bpf_dynptr_write_proto =3D { .func =3D bpf_dynptr_write, .gpl_only =3D false, .ret_type =3D RET_INTEGER, @@ -1572,7 +1572,7 @@ BPF_CALL_3(bpf_dynptr_data, struct bpf_dynptr_kern *,= ptr, u32, offset, u32, len return (unsigned long)(ptr->data + ptr->offset + offset); } =20 -const struct bpf_func_proto bpf_dynptr_data_proto =3D { +static const struct bpf_func_proto bpf_dynptr_data_proto =3D { .func =3D bpf_dynptr_data, .gpl_only =3D false, .ret_type =3D RET_PTR_TO_DYNPTR_MEM_OR_NULL, diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index d334aeb23407..7a3444988c84 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -5138,7 +5138,7 @@ BPF_CALL_4(bpf_kallsyms_lookup_name, const char *, na= me, int, name_sz, int, flag return *res ? 0 : -ENOENT; } =20 -const struct bpf_func_proto bpf_kallsyms_lookup_name_proto =3D { +static const struct bpf_func_proto bpf_kallsyms_lookup_name_proto =3D { .func =3D bpf_kallsyms_lookup_name, .gpl_only =3D false, .ret_type =3D RET_INTEGER, --=20 2.35.1