Skip to content

bpf: turn off sanitizer in do_misc_fixups for old clang #5499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: bpf-next_base
Choose a base branch
from
+9 −2
Open

bpf: turn off sanitizer in do_misc_fixups for old clang #5499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions kernel/bpf/verifier.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19811,7 +19811,14 @@ static int do_check_insn(struct bpf_verifier_env *env, bool *do_print_state)
return 0;
}

static int do_check(struct bpf_verifier_env *env)
#if defined(CONFIG_CC_IS_CLANG) && CONFIG_CLANG_VERSION < 180100
/* old clang versions cause excessive stack usage here */
#define __workaround_kasan __disable_sanitizer_instrumentation
#else
#define __workaround_kasan
#endif

static __workaround_kasan int do_check(struct bpf_verifier_env *env)
{
bool pop_log = !(env->log.level & BPF_LOG_LEVEL2);
struct bpf_verifier_state *state = env->cur_state;
Expand Down Expand Up @@ -21818,7 +21825,7 @@ static int add_hidden_subprog(struct bpf_verifier_env *env, struct bpf_insn *pat
/* Do various post-verification rewrites in a single program pass.
* These rewrites simplify JIT and interpreter implementations.
*/
static int do_misc_fixups(struct bpf_verifier_env *env)
static __workaround_kasan int do_misc_fixups(struct bpf_verifier_env *env)
{
struct bpf_prog *prog = env->prog;
enum bpf_attach_type eatype = prog->expected_attach_type;
Expand Down
Loading