linux-kernel - Re: [PATCH net-next v1] bpf: Remove redundant ifdef

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <f83892da-d672-8bf7-18e4-85de21deea84@huawei.com>
Date:   Mon, 13 Feb 2017 09:53:49 +0800
From:   "Wangnan (F)" <wangnan0@...wei.com>
To:     Mickaël Salaün <mic@...ikod.net>,
        <linux-kernel@...r.kernel.org>
CC:     Alexei Starovoitov <ast@...com>,
        Daniel Borkmann <daniel@...earbox.net>,
        "David S . Miller" <davem@...emloft.net>, <netdev@...r.kernel.org>
Subject: Re: [PATCH net-next v1] bpf: Remove redundant ifdef



On 2017/2/12 3:37, Mickaël Salaün wrote:
> Remove a useless ifdef __NR_bpf as requested by Wang Nan.
>
> Inline one-line static functions as it was in the bpf_sys.h file.
>
> Signed-off-by: Mickaël Salaün <mic@...ikod.net>
> Cc: Alexei Starovoitov <ast@...com>
> Cc: Daniel Borkmann <daniel@...earbox.net>
> Cc: David S. Miller <davem@...emloft.net>
> Cc: Wang Nan <wangnan0@...wei.com>
> Link: https://lkml.kernel.org/r/828ab1ff-4dcf-53ff-c97b-074adb895006@huawei.com
> ---
>   tools/lib/bpf/bpf.c | 12 +++---------
>   1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
> index 50e04cc5dddd..2de9c386989a 100644
> --- a/tools/lib/bpf/bpf.c
> +++ b/tools/lib/bpf/bpf.c
> @@ -42,21 +42,15 @@
>   # endif
>   #endif
>   
> -static __u64 ptr_to_u64(const void *ptr)
> +static inline __u64 ptr_to_u64(const void *ptr)
>   {
>   	return (__u64) (unsigned long) ptr;
>   }
>   
> -static int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,
> -		   unsigned int size)
> +static inline int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,
> +			  unsigned int size)
>   {
> -#ifdef __NR_bpf
>   	return syscall(__NR_bpf, cmd, attr, size);
> -#else
> -	fprintf(stderr, "No bpf syscall, kernel headers too old?\n");
> -	errno = ENOSYS;
> -	return -1;
> -#endif
>   }
>   
>   int bpf_create_map(enum bpf_map_type map_type, int key_size,

Acked-by: Wang Nan <wangnan0@...wei.com>

However, it is better to merge this patch with commit 
702498a1426bc95b6f49f9c5fba616110cbd3947.

Thank you.