netdev - Re: [PATCH bpf-next] bpf: fix build without bpf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAPhsuW5ujxPyAExPAT7fp=PzEdLKmPysh=5ZKAN5J2B85buShQ@mail.gmail.com>
Date:   Thu, 28 Feb 2019 11:08:18 -0800
From:   Song Liu <liu.song.a23@...il.com>
To:     Alexei Starovoitov <ast@...nel.org>
Cc:     "David S . Miller" <davem@...emloft.net>,
        Daniel Borkmann <daniel@...earbox.net>, sfr@...b.auug.org.au,
        Networking <netdev@...r.kernel.org>, bpf@...r.kernel.org,
        kernel-team@...com
Subject: Re: [PATCH bpf-next] bpf: fix build without bpf_syscall

On Wed, Feb 27, 2019 at 6:32 PM Alexei Starovoitov <ast@...nel.org> wrote:
>
> wrap bpf_stats_enabled sysctl with #ifdef
>
> Reported-by: Stephen Rothwell <sfr@...b.auug.org.au>
> Fixes: 492ecee892c2 ("bpf: enable program stats")
> Signed-off-by: Alexei Starovoitov <ast@...nel.org>
Acked-by: Song Liu <songliubraving@...com>

> ---
>  kernel/sysctl.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/sysctl.c b/kernel/sysctl.c
> index 86e0771352f2..7578e21a711b 100644
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@ -224,9 +224,11 @@ static int proc_dostring_coredump(struct ctl_table *table, int write,
>  #endif
>  static int proc_dopipe_max_size(struct ctl_table *table, int write,
>                 void __user *buffer, size_t *lenp, loff_t *ppos);
> +#ifdef CONFIG_BPF_SYSCALL
>  static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,
>                                           void __user *buffer, size_t *lenp,
>                                           loff_t *ppos);
> +#endif
>
>  #ifdef CONFIG_MAGIC_SYSRQ
>  /* Note: sysrq code uses its own private copy */
> @@ -1232,7 +1234,6 @@ static struct ctl_table kern_table[] = {
>                 .extra1         = &one,
>                 .extra2         = &one,
>         },
> -#endif
>         {
>                 .procname       = "bpf_stats_enabled",
>                 .data           = &sysctl_bpf_stats_enabled,
> @@ -1242,6 +1243,7 @@ static struct ctl_table kern_table[] = {
>                 .extra1         = &zero,
>                 .extra2         = &one,
>         },
> +#endif
>  #if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU)
>         {
>                 .procname       = "panic_on_rcu_stall",
> @@ -3272,6 +3274,7 @@ int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int write,
>
>  #endif /* CONFIG_PROC_SYSCTL */
>
> +#ifdef CONFIG_BPF_SYSCALL
>  static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,
>                                           void __user *buffer, size_t *lenp,
>                                           loff_t *ppos)
> @@ -3293,7 +3296,7 @@ static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,
>         }
>         return ret;
>  }
> -
> +#endif
>  /*
>   * No sense putting this after each symbol definition, twice,
>   * exception granted :-)
> --
> 2.20.0
>