Commit 9e4e01df authored by KP Singh's avatar KP Singh Committed by Daniel Borkmann
Browse files

bpf: lsm: Implement attach, detach and execution 



JITed BPF programs are dynamically attached to the LSM hooks
using BPF trampolines. The trampoline prologue generates code to handle
conversion of the signature of the hook to the appropriate BPF context.

The allocated trampoline programs are attached to the nop functions
initialized as LSM hooks.

BPF_PROG_TYPE_LSM programs must have a GPL compatible license and
and need CAP_SYS_ADMIN (required for loading eBPF programs).

Upon attachment:

* A BPF fexit trampoline is used for LSM hooks with a void return type.
* A BPF fmod_ret trampoline is used for LSM hooks which return an
  int. The attached programs can override the return value of the
  bpf LSM hook to indicate a MAC Policy decision.

Signed-off-by: default avatarKP Singh <kpsingh@google.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Reviewed-by: default avatarBrendan Jackman <jackmanb@google.com>
Reviewed-by: default avatarFlorent Revest <revest@google.com>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Acked-by: default avatarJames Morris <jamorris@linux.microsoft.com>
Link: https://lore.kernel.org/bpf/20200329004356.27286-5-kpsingh@chromium.org
parent 9d3fdea7

include/linux/bpf_lsm.h

+11 −0
Original line number Diff line number Diff line
@@ -17,6 +17,17 @@ 
#include <linux/lsm_hook_defs.h>

#undef LSM_HOOK



int bpf_lsm_verify_prog(struct bpf_verifier_log *vlog,

			const struct bpf_prog *prog);



#else /* !CONFIG_BPF_LSM */



static inline int bpf_lsm_verify_prog(struct bpf_verifier_log *vlog,

				      const struct bpf_prog *prog)

{

	return -EOPNOTSUPP;

}



#endif /* CONFIG_BPF_LSM */



#endif /* _LINUX_BPF_LSM_H */

kernel/bpf/bpf_lsm.c

+23 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#include <linux/btf.h>

#include <linux/lsm_hooks.h>

#include <linux/bpf_lsm.h>

#include <linux/kallsyms.h>

#include <linux/bpf_verifier.h>



/* For every LSM hook that allows attachment of BPF programs, declare a nop

 * function where a BPF program can be attached.
@@ -22,6 +24,27 @@ noinline RET bpf_lsm_##NAME(__VA_ARGS__) \ 
#include <linux/lsm_hook_defs.h>

#undef LSM_HOOK



#define BPF_LSM_SYM_PREFX  "bpf_lsm_"



int bpf_lsm_verify_prog(struct bpf_verifier_log *vlog,

			const struct bpf_prog *prog)

{

	if (!prog->gpl_compatible) {

		bpf_log(vlog,

			"LSM programs must have a GPL compatible license\n");

		return -EINVAL;

	}



	if (strncmp(BPF_LSM_SYM_PREFX, prog->aux->attach_func_name,

		    sizeof(BPF_LSM_SYM_PREFX) - 1)) {

		bpf_log(vlog, "attach_btf_id %u points to wrong type name %s\n",

			prog->aux->attach_btf_id, prog->aux->attach_func_name);

		return -EINVAL;

	}



	return 0;

}



const struct bpf_prog_ops lsm_prog_ops = {

};

kernel/bpf/btf.c

+15 −1
Original line number Diff line number Diff line
@@ -3710,7 +3710,21 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type, 
	}



	if (arg == nr_args) {

		if (prog->expected_attach_type == BPF_TRACE_FEXIT) {

		if (prog->expected_attach_type == BPF_TRACE_FEXIT ||

		    prog->expected_attach_type == BPF_LSM_MAC) {

			/* When LSM programs are attached to void LSM hooks

			 * they use FEXIT trampolines and when attached to

			 * int LSM hooks, they use MODIFY_RETURN trampolines.

			 *

			 * While the LSM programs are BPF_MODIFY_RETURN-like

			 * the check:

			 *

			 *	if (ret_type != 'int')

			 *		return -EINVAL;

			 *

			 * is _not_ done here. This is still safe as LSM hooks

			 * have only void and int return types.

			 */

			if (!t)

				return true;

			t = btf_type_by_id(btf, t->type);

kernel/bpf/syscall.c

+39 −18
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/nospec.h>

#include <linux/audit.h>

#include <uapi/linux/btf.h>

#include <linux/bpf_lsm.h>



#define IS_FD_ARRAY(map) ((map)->map_type == BPF_MAP_TYPE_PERF_EVENT_ARRAY || \

			  (map)->map_type == BPF_MAP_TYPE_CGROUP_ARRAY || \
@@ -1935,6 +1936,7 @@ bpf_prog_load_check_attach(enum bpf_prog_type prog_type, 


		switch (prog_type) {

		case BPF_PROG_TYPE_TRACING:

		case BPF_PROG_TYPE_LSM:

		case BPF_PROG_TYPE_STRUCT_OPS:

		case BPF_PROG_TYPE_EXT:

			break;
@@ -2366,10 +2368,28 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog) 
	struct file *link_file;

	int link_fd, err;



	switch (prog->type) {

	case BPF_PROG_TYPE_TRACING:

		if (prog->expected_attach_type != BPF_TRACE_FENTRY &&

		    prog->expected_attach_type != BPF_TRACE_FEXIT &&

	    prog->expected_attach_type != BPF_MODIFY_RETURN &&

	    prog->type != BPF_PROG_TYPE_EXT) {

		    prog->expected_attach_type != BPF_MODIFY_RETURN) {

			err = -EINVAL;

			goto out_put_prog;

		}

		break;

	case BPF_PROG_TYPE_EXT:

		if (prog->expected_attach_type != 0) {

			err = -EINVAL;

			goto out_put_prog;

		}

		break;

	case BPF_PROG_TYPE_LSM:

		if (prog->expected_attach_type != BPF_LSM_MAC) {

			err = -EINVAL;

			goto out_put_prog;

		}

		break;

	default:

		err = -EINVAL;

		goto out_put_prog;

	}
@@ -2448,16 +2468,10 @@ static int bpf_raw_tracepoint_open(const union bpf_attr *attr) 
	if (IS_ERR(prog))

		return PTR_ERR(prog);



	if (prog->type != BPF_PROG_TYPE_RAW_TRACEPOINT &&

	    prog->type != BPF_PROG_TYPE_TRACING &&

	    prog->type != BPF_PROG_TYPE_EXT &&

	    prog->type != BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE) {

		err = -EINVAL;

		goto out_put_prog;

	}



	if (prog->type == BPF_PROG_TYPE_TRACING ||

	    prog->type == BPF_PROG_TYPE_EXT) {

	switch (prog->type) {

	case BPF_PROG_TYPE_TRACING:

	case BPF_PROG_TYPE_EXT:

	case BPF_PROG_TYPE_LSM:

		if (attr->raw_tracepoint.name) {

			/* The attach point for this category of programs

			 * should be specified via btf_id during program load.
@@ -2465,11 +2479,14 @@ static int bpf_raw_tracepoint_open(const union bpf_attr *attr) 
			err = -EINVAL;

			goto out_put_prog;

		}

		if (prog->expected_attach_type == BPF_TRACE_RAW_TP)

		if (prog->type == BPF_PROG_TYPE_TRACING &&

		    prog->expected_attach_type == BPF_TRACE_RAW_TP) {

			tp_name = prog->aux->attach_func_name;

		else

			break;

		}

		return bpf_tracing_prog_attach(prog);

	} else {

	case BPF_PROG_TYPE_RAW_TRACEPOINT:

	case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE:

		if (strncpy_from_user(buf,

				      u64_to_user_ptr(attr->raw_tracepoint.name),

				      sizeof(buf) - 1) < 0) {
@@ -2478,6 +2495,10 @@ static int bpf_raw_tracepoint_open(const union bpf_attr *attr) 
		}

		buf[sizeof(buf) - 1] = 0;

		tp_name = buf;

		break;

	default:

		err = -EINVAL;

		goto out_put_prog;

	}



	btp = bpf_get_raw_tracepoint(tp_name);

kernel/bpf/trampoline.c

+13 −4
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/ftrace.h>

#include <linux/rbtree_latch.h>

#include <linux/perf_event.h>

#include <linux/btf.h>



/* dummy _ops. The verifier will operate on target program's ops. */

const struct bpf_verifier_ops bpf_extension_verifier_ops = {
@@ -233,15 +234,23 @@ out: 
	return err;

}



static enum bpf_tramp_prog_type bpf_attach_type_to_tramp(enum bpf_attach_type t)

static enum bpf_tramp_prog_type bpf_attach_type_to_tramp(struct bpf_prog *prog)

{

	switch (t) {

	switch (prog->expected_attach_type) {

	case BPF_TRACE_FENTRY:

		return BPF_TRAMP_FENTRY;

	case BPF_MODIFY_RETURN:

		return BPF_TRAMP_MODIFY_RETURN;

	case BPF_TRACE_FEXIT:

		return BPF_TRAMP_FEXIT;

	case BPF_LSM_MAC:

		if (!prog->aux->attach_func_proto->type)

			/* The function returns void, we cannot modify its

			 * return value.

			 */

			return BPF_TRAMP_FEXIT;

		else

			return BPF_TRAMP_MODIFY_RETURN;

	default:

		return BPF_TRAMP_REPLACE;

	}
@@ -255,7 +264,7 @@ int bpf_trampoline_link_prog(struct bpf_prog *prog) 
	int cnt;



	tr = prog->aux->trampoline;

	kind = bpf_attach_type_to_tramp(prog->expected_attach_type);

	kind = bpf_attach_type_to_tramp(prog);

	mutex_lock(&tr->mutex);

	if (tr->extension_prog) {

		/* cannot attach fentry/fexit if extension prog is attached.
@@ -305,7 +314,7 @@ int bpf_trampoline_unlink_prog(struct bpf_prog *prog) 
	int err;



	tr = prog->aux->trampoline;

	kind = bpf_attach_type_to_tramp(prog->expected_attach_type);

	kind = bpf_attach_type_to_tramp(prog);

	mutex_lock(&tr->mutex);

	if (kind == BPF_TRAMP_REPLACE) {

		WARN_ON_ONCE(!tr->extension_prog);

CRA Git | Maintained and supported by SUSTech CRA and CCSE