diff options
| author |  Jakub Kicinski <kuba@kernel.org>
| 2021-12-09 12:04:19 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org>
| 2021-12-09 13:23:02 -0800 |
| commit | 3150a73366b64e3109f0facbc98bcacbc14e81ba (patch) | |
| tree | 2b94b32c5fe97a4e76058a6f65e8c5717b53ee16 /kernel/bpf | |
| parent | skbuff: Extract list pointers to silence compiler warnings (diff) | |
| parent | Merge tag 'net-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-3150a73366b64e3109f0facbc98bcacbc14e81ba.tar.gz linux-3150a73366b64e3109f0facbc98bcacbc14e81ba.tar.bz2 linux-3150a73366b64e3109f0facbc98bcacbc14e81ba.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/btf.c | 11 | ||||
| -rw-r--r-- | kernel/bpf/verifier.c | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 6b9d23be1e99..48cdf5b425a7 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -6361,11 +6361,6 @@ BTF_TRACING_TYPE_xxx /* BTF ID set registration API for modules */ -struct kfunc_btf_id_list { - struct list_head list; - struct mutex mutex; -}; - #ifdef CONFIG_DEBUG_INFO_BTF_MODULES void register_kfunc_btf_id_set(struct kfunc_btf_id_list *l, @@ -6391,8 +6386,6 @@ bool bpf_check_mod_kfunc_call(struct kfunc_btf_id_list *klist, u32 kfunc_id, { struct kfunc_btf_id_set *s; - if (!owner) - return false; mutex_lock(&klist->mutex); list_for_each_entry(s, &klist->list, list) { if (s->owner == owner && btf_id_set_contains(s->set, kfunc_id)) { @@ -6404,8 +6397,6 @@ bool bpf_check_mod_kfunc_call(struct kfunc_btf_id_list *klist, u32 kfunc_id, return false; } -#endif - #define DEFINE_KFUNC_BTF_ID_LIST(name) \ struct kfunc_btf_id_list name = { LIST_HEAD_INIT(name.list), \ __MUTEX_INITIALIZER(name.mutex) }; \ @@ -6413,3 +6404,5 @@ bool bpf_check_mod_kfunc_call(struct kfunc_btf_id_list *klist, u32 kfunc_id, DEFINE_KFUNC_BTF_ID_LIST(bpf_tcp_ca_kfunc_list); DEFINE_KFUNC_BTF_ID_LIST(prog_test_kfunc_list); + +#endif diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 88fe97d35166..90675b987148 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -8456,7 +8456,7 @@ static void find_good_pkt_pointers(struct bpf_verifier_state *vstate, new_range = dst_reg->off; if (range_right_open) - new_range--; + new_range++; /* Examples for register markings: * |