Commit 1110f3a9 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

bpf: add map_alloc_check callback 



.map_alloc callbacks contain a number of checks validating user-
-provided map attributes against constraints of a particular map
type.  For offloaded maps we will need to check map attributes
without actually allocating any memory on the host.  Add a new
callback for validating attributes before any memory is allocated.
This callback can be selectively implemented by map types for
sharing code with offloads, or simply to separate the logical
steps of validation and allocation.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent fdde5f3b

include/linux/bpf.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ struct bpf_map; 
/* map is generic key/value storage optionally accesible by eBPF programs */

struct bpf_map_ops {

	/* funcs callable from userspace (via syscall) */

	int (*map_alloc_check)(union bpf_attr *attr);

	struct bpf_map *(*map_alloc)(union bpf_attr *attr);

	void (*map_release)(struct bpf_map *map, struct file *map_file);

	void (*map_free)(struct bpf_map *map);

kernel/bpf/syscall.c

+13 −4
Original line number Diff line number Diff line
@@ -96,16 +96,25 @@ static int check_uarg_tail_zero(void __user *uaddr, 


static struct bpf_map *find_and_alloc_map(union bpf_attr *attr)

{

	const struct bpf_map_ops *ops;

	struct bpf_map *map;

	int err;



	if (attr->map_type >= ARRAY_SIZE(bpf_map_types) ||

	    !bpf_map_types[attr->map_type])

	if (attr->map_type >= ARRAY_SIZE(bpf_map_types))

		return ERR_PTR(-EINVAL);

	ops = bpf_map_types[attr->map_type];

	if (!ops)

		return ERR_PTR(-EINVAL);



	map = bpf_map_types[attr->map_type]->map_alloc(attr);

	if (ops->map_alloc_check) {

		err = ops->map_alloc_check(attr);

		if (err)

			return ERR_PTR(err);

	}

	map = ops->map_alloc(attr);

	if (IS_ERR(map))

		return map;

	map->ops = bpf_map_types[attr->map_type];

	map->ops = ops;

	map->map_type = attr->map_type;

	return map;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE