From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: KP Singh <kpsingh@chromium.org>
Cc: open list <linux-kernel@vger.kernel.org>,
bpf <bpf@vger.kernel.org>, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Paul Turner <pjt@google.com>,
Florent Revest <revest@chromium.org>,
Brendan Jackman <jackmanb@chromium.org>
Subject: Re: [PATCH bpf-next 0/7] Introduce BPF_MODIFY_RET tracing progs.
Date: Tue, 3 Mar 2020 14:12:43 -0800 [thread overview]
Message-ID: <CAEf4BzZkkbf0a-pCcmxq6+=XdJH6H7pPwbzq=UiMKRpWnJceyA@mail.gmail.com> (raw)
In-Reply-To: <20200303140950.6355-1-kpsingh@chromium.org>
On Tue, Mar 3, 2020 at 6:12 AM KP Singh <kpsingh@chromium.org> wrote:
>
> From: KP Singh <kpsingh@google.com>
>
> This was brought up in the KRSI v4 discussion and found to be useful
> both for security and tracing programs.
>
> https://lore.kernel.org/bpf/20200225193108.GB22391@chromium.org/
>
> The modify_return programs are allowed for security hooks (with an
> extra CAP_MAC_ADMIN check) and functions whitelisted for error
> injection (ALLOW_ERROR_INJECTION).
>
> The "security_" check is expected to be cleaned up with the KRSI patch
> series.
>
> Here is an example of how a fmod_ret program behaves:
>
> int func_to_be_attached(int a, int b)
> { <--- do_fentry
>
> do_fmod_ret:
> <update ret by calling fmod_ret>
> if (ret != 0)
> goto do_fexit;
>
> original_function:
>
> <side_effects_happen_here>
>
> } <--- do_fexit
>
> ALLOW_ERROR_INJECTION(func_to_be_attached, ERRNO)
>
> The fmod_ret program attached to this function can be defined as:
>
> SEC("fmod_ret/func_to_be_attached")
> BPF_PROG(func_name, int a, int b, int ret)
nit: int BPF_PROG(...)
> {
> // This will skip the original function logic.
> return -1;
> }
>
> KP Singh (7):
> bpf: Refactor trampoline update code
> bpf: JIT helpers for fmod_ret progs
> bpf: Introduce BPF_MODIFY_RETURN
> bpf: Attachment verification for BPF_MODIFY_RETURN
> tools/libbpf: Add support for BPF_MODIFY_RETURN
> bpf: Add test ops for BPF_PROG_TYPE_TRACING
> bpf: Add selftests for BPF_MODIFY_RETURN
>
> arch/x86/net/bpf_jit_comp.c | 261 +++++++++++++-----
> include/linux/bpf.h | 24 +-
> include/uapi/linux/bpf.h | 1 +
> kernel/bpf/bpf_struct_ops.c | 13 +-
> kernel/bpf/btf.c | 27 +-
> kernel/bpf/syscall.c | 1 +
> kernel/bpf/trampoline.c | 66 +++--
> kernel/bpf/verifier.c | 32 +++
> kernel/trace/bpf_trace.c | 1 +
> net/bpf/test_run.c | 57 +++-
> tools/include/uapi/linux/bpf.h | 1 +
> tools/lib/bpf/libbpf.c | 4 +
> .../selftests/bpf/prog_tests/fentry_fexit.c | 12 +-
> .../selftests/bpf/prog_tests/fentry_test.c | 14 +-
> .../selftests/bpf/prog_tests/fexit_test.c | 69 ++---
> .../selftests/bpf/prog_tests/modify_return.c | 65 +++++
> .../selftests/bpf/progs/modify_return.c | 49 ++++
> 17 files changed, 509 insertions(+), 188 deletions(-)
> create mode 100644 tools/testing/selftests/bpf/prog_tests/modify_return.c
> create mode 100644 tools/testing/selftests/bpf/progs/modify_return.c
>
> --
> 2.20.1
>
next prev parent reply other threads:[~2020-03-03 22:12 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-03 14:09 [PATCH bpf-next 0/7] Introduce BPF_MODIFY_RET tracing progs KP Singh
2020-03-03 14:09 ` [PATCH bpf-next 1/7] bpf: Refactor trampoline update code KP Singh
2020-03-03 22:12 ` Andrii Nakryiko
2020-03-03 22:24 ` KP Singh
2020-03-03 23:03 ` Andrii Nakryiko
2020-03-03 23:08 ` KP Singh
2020-03-03 14:09 ` [PATCH bpf-next 2/7] bpf: JIT helpers for fmod_ret progs KP Singh
2020-03-03 22:26 ` Andrii Nakryiko
2020-03-03 22:28 ` KP Singh
2020-03-03 23:56 ` Alexei Starovoitov
2020-03-04 1:26 ` KP Singh
2020-03-03 14:09 ` [PATCH bpf-next 3/7] bpf: Introduce BPF_MODIFY_RETURN KP Singh
2020-03-03 22:37 ` Andrii Nakryiko
2020-03-03 22:51 ` KP Singh
2020-03-03 14:09 ` [PATCH bpf-next 4/7] bpf: Attachment verification for BPF_MODIFY_RETURN KP Singh
2020-03-03 22:44 ` Andrii Nakryiko
2020-03-03 23:21 ` KP Singh
2020-03-04 0:03 ` Alexei Starovoitov
2020-03-04 1:06 ` KP Singh
2020-03-03 14:09 ` [PATCH bpf-next 5/7] tools/libbpf: Add support " KP Singh
2020-03-03 22:45 ` Andrii Nakryiko
2020-03-03 14:09 ` [PATCH bpf-next 6/7] bpf: Add test ops for BPF_PROG_TYPE_TRACING KP Singh
2020-03-03 22:51 ` Andrii Nakryiko
2020-03-03 22:57 ` KP Singh
2020-03-03 14:09 ` [PATCH bpf-next 7/7] bpf: Add selftests for BPF_MODIFY_RETURN KP Singh
2020-03-03 22:58 ` Andrii Nakryiko
2020-03-03 22:12 ` Andrii Nakryiko [this message]
2020-03-03 22:25 ` [PATCH bpf-next 0/7] Introduce BPF_MODIFY_RET tracing progs 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='CAEf4BzZkkbf0a-pCcmxq6+=XdJH6H7pPwbzq=UiMKRpWnJceyA@mail.gmail.com' \
--to=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=jackmanb@chromium.org \
--cc=kpsingh@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pjt@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).