netdev - Re: [RFC PATCH bpf-next v4 5/7] bpf: restrict use of peek/push/pop

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 for Android: free password hash cracker in your pocket

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

Message-ID: <20181004235754.2c6trhnddmkmptiv@ast-mbp.dhcp.thefacebook.com>
Date:   Thu, 4 Oct 2018 16:57:55 -0700
From:   Alexei Starovoitov <alexei.starovoitov@...il.com>
To:     Mauricio Vasquez B <mauricio.vasquez@...ito.it>
Cc:     Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>, netdev@...r.kernel.org
Subject: Re: [RFC PATCH bpf-next v4 5/7] bpf: restrict use of peek/push/pop

On Thu, Oct 04, 2018 at 07:12:49PM +0200, Mauricio Vasquez B wrote:
> Restrict the use of peek, push and pop helpers only to queue and stack
> maps.
> 
> Signed-off-by: Mauricio Vasquez B <mauricio.vasquez@...ito.it>
> ---
>  kernel/bpf/verifier.c |   14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index 489667f93061..8b1f1b348782 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -2328,6 +2328,13 @@ static int check_map_func_compatibility(struct bpf_verifier_env *env,
>  		if (func_id != BPF_FUNC_sk_select_reuseport)
>  			goto error;
>  		break;
> +	case BPF_MAP_TYPE_QUEUE:
> +	case BPF_MAP_TYPE_STACK:
> +		if (func_id != BPF_FUNC_map_peek_elem &&
> +		    func_id != BPF_FUNC_map_pop_elem &&
> +		    func_id != BPF_FUNC_map_push_elem)
> +			goto error;

why this is separate patch?
I think it should be part of previous patch.

> +		break;
>  	default:
>  		break;
>  	}
> @@ -2384,6 +2391,13 @@ static int check_map_func_compatibility(struct bpf_verifier_env *env,
>  		if (map->map_type != BPF_MAP_TYPE_REUSEPORT_SOCKARRAY)
>  			goto error;
>  		break;
> +	case BPF_FUNC_map_peek_elem:
> +	case BPF_FUNC_map_pop_elem:
> +	case BPF_FUNC_map_push_elem:
> +		if (map->map_type != BPF_MAP_TYPE_QUEUE &&
> +		    map->map_type != BPF_MAP_TYPE_STACK)
> +			goto error;
> +		break;
>  	default:
>  		break;
>  	}
>