Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1456335
| From | Daniel Borkmann <daniel@iogearbox.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [RFC 4/4] bpf: Restrict Checmate bpf programs to current kernel ABI |
| Date | 2016-08-04 13:00 +0200 |
| Message-ID | <s2oxA-7OH-25@gated-at.bofh.it> (permalink) |
| References | <s2l6F-5K2-15@gated-at.bofh.it> <s2oxA-7OH-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On 08/04/2016 11:52 AM, Daniel Borkmann wrote: > On 08/04/2016 09:12 AM, Sargun Dhillon wrote: >> I think it makes sense to restrict Checmate to loading programs that have been >> compiled with the current kernel ABI. We can further stabilize the ABI, and >> perhaps lift this restriction later. >> >> Signed-off-by: Sargun Dhillon <sargun@sargun.me> >> --- >> kernel/bpf/syscall.c | 2 +- >> samples/bpf/checmate1_kern.c | 3 ++- >> 2 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c >> index 228f962..2a37b4d 100644 >> --- a/kernel/bpf/syscall.c >> +++ b/kernel/bpf/syscall.c >> @@ -741,7 +741,7 @@ static int bpf_prog_load(union bpf_attr *attr) >> if (attr->insn_cnt >= BPF_MAXINSNS) >> return -EINVAL; >> >> - if (type == BPF_PROG_TYPE_KPROBE && >> + if ((type & (BPF_PROG_TYPE_KPROBE | BPF_PROG_TYPE_CHECMATE)) && >> attr->kern_version != LINUX_VERSION_CODE) > > Btw, this check is correct, program types are not masks. Sorry, I meant to write *not* correct, which was hopefully inferable from the rest. > BPF_PROG_TYPE_KPROBE (== 2) and BPF_PROG_TYPE_CHECMATE (== 7) will now > require every type to have a version code ... > >> return -EINVAL; >>
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[RFC 4/4] bpf: Restrict Checmate bpf programs to current kernel ABI Sargun Dhillon <sargun@sargun.me> - 2016-08-04 09:20 +0200
Re: [RFC 4/4] bpf: Restrict Checmate bpf programs to current kernel ABI Daniel Borkmann <daniel@iogearbox.net> - 2016-08-04 13:00 +0200
Re: [RFC 4/4] bpf: Restrict Checmate bpf programs to current kernel ABI Daniel Borkmann <daniel@iogearbox.net> - 2016-08-04 13:00 +0200
csiph-web