Commit f1a5fb6c authored by Benjamin Tissoires's avatar Benjamin Tissoires

HID: bpf: rework hid_bpf_ops_btf_struct_access

The idea is to provide a list of stucts and their editable fields.

Currently no functional changes are introduced here, we will add some
more writeable fields in the next patch.
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/r/20240608-hid_bpf_struct_ops-v3-15-6ac6ade58329@kernel.orgSigned-off-by: default avatarBenjamin Tissoires <bentiss@kernel.org>
parent bd074754
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/hid_bpf.h> #include <linux/hid_bpf.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/stddef.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include "hid_bpf_dispatch.h" #include "hid_bpf_dispatch.h"
...@@ -52,40 +53,86 @@ static int hid_bpf_ops_check_member(const struct btf_type *t, ...@@ -52,40 +53,86 @@ static int hid_bpf_ops_check_member(const struct btf_type *t,
return 0; return 0;
} }
struct hid_bpf_offset_write_range {
const char *struct_name;
u32 struct_length;
u32 start;
u32 end;
};
static int hid_bpf_ops_btf_struct_access(struct bpf_verifier_log *log, static int hid_bpf_ops_btf_struct_access(struct bpf_verifier_log *log,
const struct bpf_reg_state *reg, const struct bpf_reg_state *reg,
int off, int size) int off, int size)
{ {
const struct btf_type *state; #define WRITE_RANGE(_name, _field, _is_string) \
const struct btf_type *t; { \
s32 type_id; .struct_name = #_name, \
.struct_length = sizeof(struct _name), \
.start = offsetof(struct _name, _field), \
.end = offsetofend(struct _name, _field) - !!(_is_string), \
}
type_id = btf_find_by_name_kind(reg->btf, "hid_bpf_ctx", const struct hid_bpf_offset_write_range write_ranges[] = {
BTF_KIND_STRUCT); WRITE_RANGE(hid_bpf_ctx, retval, false),
if (type_id < 0) };
return -EINVAL; #undef WRITE_RANGE
const struct btf_type *state = NULL;
const struct btf_type *t;
const char *cur = NULL;
int i;
t = btf_type_by_id(reg->btf, reg->btf_id); t = btf_type_by_id(reg->btf, reg->btf_id);
state = btf_type_by_id(reg->btf, type_id);
if (t != state) {
bpf_log(log, "only access to hid_bpf_ctx is supported\n");
return -EACCES;
}
/* out-of-bound access in hid_bpf_ctx */ for (i = 0; i < ARRAY_SIZE(write_ranges); i++) {
if (off + size > sizeof(struct hid_bpf_ctx)) { const struct hid_bpf_offset_write_range *write_range = &write_ranges[i];
bpf_log(log, "write access at off %d with size %d\n", off, size); s32 type_id;
return -EACCES;
/* we already found a writeable struct, but there is a
* new one, let's break the loop.
*/
if (t == state && write_range->struct_name != cur)
break;
/* new struct to look for */
if (write_range->struct_name != cur) {
type_id = btf_find_by_name_kind(reg->btf, write_range->struct_name,
BTF_KIND_STRUCT);
if (type_id < 0)
return -EINVAL;
state = btf_type_by_id(reg->btf, type_id);
}
/* this is not the struct we are looking for */
if (t != state) {
cur = write_range->struct_name;
continue;
}
/* first time we see this struct, check for out of bounds */
if (cur != write_range->struct_name &&
off + size > write_range->struct_length) {
bpf_log(log, "write access for struct %s at off %d with size %d\n",
write_range->struct_name, off, size);
return -EACCES;
}
/* now check if we are in our boundaries */
if (off >= write_range->start && off + size <= write_range->end)
return NOT_INIT;
cur = write_range->struct_name;
} }
if (off < offsetof(struct hid_bpf_ctx, retval)) {
if (t != state)
bpf_log(log, "write access to this struct is not supported\n");
else
bpf_log(log, bpf_log(log,
"write access at off %d with size %d on read-only part of hid_bpf_ctx\n", "write access at off %d with size %d on read-only part of %s\n",
off, size); off, size, cur);
return -EACCES;
}
return NOT_INIT; return -EACCES;
} }
static const struct bpf_verifier_ops hid_bpf_verifier_ops = { static const struct bpf_verifier_ops hid_bpf_verifier_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment