[PATCH OLK-6.6] bpf: Fix the use of prog->axu->sleepable
hulk inclusion category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/8335 CVE: NA -------------------------------- After commit 137a3f0724c8 ("bpf: move sleepable flag from bpf_prog_aux to bpf_prog"), the sleepable variable is no longer usable. However, commit 038a41427a20 ("bpf: Reject sleepable kprobe_multi programs at attach time") uses it accidentally. Fix it by using prog->sleepable. Fixes: 137a3f0724c8 ("bpf: move sleepable flag from bpf_prog_aux to bpf_prog") Signed-off-by: Luo Gengkun <luogengkun2@huawei.com> --- kernel/trace/bpf_trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 52cb76dd27c8..768159fad93c 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2900,7 +2900,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr return -EOPNOTSUPP; /* kprobe_multi is not allowed to be sleepable. */ - if (prog->aux->sleepable) + if (prog->sleepable) return -EINVAL; if (prog->expected_attach_type != BPF_TRACE_KPROBE_MULTI) -- 2.34.1
反馈: 您发送到kernel@openeuler.org的补丁/补丁集,已成功转换为PR! PR链接地址: https://atomgit.com/openeuler/kernel/merge_requests/22077 邮件列表地址:https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/5VF... FeedBack: The patch(es) which you have sent to kernel@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://atomgit.com/openeuler/kernel/merge_requests/22077 Mailing list address: https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/5VF...
participants (2)
-
Luo Gengkun -
patchwork bot