From: Daniel Borkmann <daniel@iogearbox.net>
To: KP Singh <kpsingh@chromium.org>,
linux-kernel@vger.kernel.org, bpf@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
Florent Revest <revest@chromium.org>,
Brendan Jackman <jackmanb@chromium.org>,
Pauline Middelink <middelin@google.com>
Subject: Re: [PATCH bpf-next v3 1/2] bpf: Add bpf_lsm_set_bprm_opts helper
Date: Tue, 17 Nov 2020 23:41:43 +0100 [thread overview]
Message-ID: <cc03ab7e-dee8-f717-7a4f-413a3a5f58b7@iogearbox.net> (raw)
In-Reply-To: <20201117021307.1846300-1-kpsingh@chromium.org>
On 11/17/20 3:13 AM, KP Singh wrote:
> From: KP Singh <kpsingh@google.com>
>
> The helper allows modification of certain bits on the linux_binprm
> struct starting with the secureexec bit which can be updated using the
> BPF_LSM_F_BPRM_SECUREEXEC flag.
>
> secureexec can be set by the LSM for privilege gaining executions to set
> the AT_SECURE auxv for glibc. When set, the dynamic linker disables the
> use of certain environment variables (like LD_PRELOAD).
>
> Signed-off-by: KP Singh <kpsingh@google.com>
> ---
> include/uapi/linux/bpf.h | 18 ++++++++++++++++++
> kernel/bpf/bpf_lsm.c | 27 +++++++++++++++++++++++++++
> scripts/bpf_helpers_doc.py | 2 ++
> tools/include/uapi/linux/bpf.h | 18 ++++++++++++++++++
> 4 files changed, 65 insertions(+)
>
> diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
> index 162999b12790..bfa79054d106 100644
> --- a/include/uapi/linux/bpf.h
> +++ b/include/uapi/linux/bpf.h
> @@ -3787,6 +3787,18 @@ union bpf_attr {
> * *ARG_PTR_TO_BTF_ID* of type *task_struct*.
> * Return
> * Pointer to the current task.
> + *
> + * long bpf_lsm_set_bprm_opts(struct linux_binprm *bprm, u64 flags)
> + *
small nit: should have no extra newline (same for the tools/ copy)
> + * Description
> + * Set or clear certain options on *bprm*:
> + *
> + * **BPF_LSM_F_BPRM_SECUREEXEC** Set the secureexec bit
> + * which sets the **AT_SECURE** auxv for glibc. The bit
> + * is cleared if the flag is not specified.
> + * Return
> + * **-EINVAL** if invalid *flags* are passed.
> + *
> */
> #define __BPF_FUNC_MAPPER(FN) \
> FN(unspec), \
> @@ -3948,6 +3960,7 @@ union bpf_attr {
> FN(task_storage_get), \
> FN(task_storage_delete), \
> FN(get_current_task_btf), \
> + FN(lsm_set_bprm_opts), \
> /* */
>
> /* integer value in 'imm' field of BPF_CALL instruction selects which helper
> @@ -4119,6 +4132,11 @@ enum bpf_lwt_encap_mode {
> BPF_LWT_ENCAP_IP,
> };
>
> +/* Flags for LSM helpers */
> +enum {
> + BPF_LSM_F_BPRM_SECUREEXEC = (1ULL << 0),
> +};
> +
> #define __bpf_md_ptr(type, name) \
> union { \
> type name; \
> diff --git a/kernel/bpf/bpf_lsm.c b/kernel/bpf/bpf_lsm.c
> index 553107f4706a..cd85482228a0 100644
> --- a/kernel/bpf/bpf_lsm.c
> +++ b/kernel/bpf/bpf_lsm.c
> @@ -7,6 +7,7 @@
> #include <linux/filter.h>
> #include <linux/bpf.h>
> #include <linux/btf.h>
> +#include <linux/binfmts.h>
> #include <linux/lsm_hooks.h>
> #include <linux/bpf_lsm.h>
> #include <linux/kallsyms.h>
> @@ -51,6 +52,30 @@ int bpf_lsm_verify_prog(struct bpf_verifier_log *vlog,
> return 0;
> }
>
> +/* Mask for all the currently supported BPRM option flags */
> +#define BPF_LSM_F_BRPM_OPTS_MASK BPF_LSM_F_BPRM_SECUREEXEC
> +
> +BPF_CALL_2(bpf_lsm_set_bprm_opts, struct linux_binprm *, bprm, u64, flags)
> +{
> +
ditto
Would have fixed up these things on the fly while applying, but one small item
I wanted to bring up here given uapi which will then freeze: it would be cleaner
to call the helper just bpf_bprm_opts_set() or so given it's implied that we
attach to lsm here and we don't use _lsm in the naming for the others either.
Similarly, I'd drop the _LSM from the flag/mask.
> + if (flags & ~BPF_LSM_F_BRPM_OPTS_MASK)
> + return -EINVAL;
> +
> + bprm->secureexec = (flags & BPF_LSM_F_BPRM_SECUREEXEC);
> + return 0;
> +}
> +
> +BTF_ID_LIST_SINGLE(bpf_lsm_set_bprm_opts_btf_ids, struct, linux_binprm)
> +
> +const static struct bpf_func_proto bpf_lsm_set_bprm_opts_proto = {
> + .func = bpf_lsm_set_bprm_opts,
> + .gpl_only = false,
> + .ret_type = RET_INTEGER,
> + .arg1_type = ARG_PTR_TO_BTF_ID,
> + .arg1_btf_id = &bpf_lsm_set_bprm_opts_btf_ids[0],
> + .arg2_type = ARG_ANYTHING,
> +};
> +
> static const struct bpf_func_proto *
> bpf_lsm_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
> {
> @@ -71,6 +96,8 @@ bpf_lsm_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
> return &bpf_task_storage_get_proto;
> case BPF_FUNC_task_storage_delete:
> return &bpf_task_storage_delete_proto;
> + case BPF_FUNC_lsm_set_bprm_opts:
> + return &bpf_lsm_set_bprm_opts_proto;
> default:
> return tracing_prog_func_proto(func_id, prog);
> }
next prev parent reply other threads:[~2020-11-17 22:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 2:13 [PATCH bpf-next v3 1/2] bpf: Add bpf_lsm_set_bprm_opts helper KP Singh
2020-11-17 2:13 ` [PATCH bpf-next v3 2/2] bpf: Add tests for bpf_lsm_set_bprm_opts KP Singh
2020-11-17 6:18 ` Martin KaFai Lau
2020-11-17 22:47 ` Daniel Borkmann
2020-11-17 6:14 ` [PATCH bpf-next v3 1/2] bpf: Add bpf_lsm_set_bprm_opts helper Martin KaFai Lau
2020-11-17 22:41 ` Daniel Borkmann [this message]
2020-11-17 23:35 ` KP Singh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cc03ab7e-dee8-f717-7a4f-413a3a5f58b7@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=jackmanb@chromium.org \
--cc=kpsingh@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=middelin@google.com \
--cc=revest@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).