diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-11 12:24:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-11 12:24:55 +0300 |
| commit | f3edacbd697f94a743fff1a3d26910ab99948ba7 (patch) | |
| tree | c185057f2e3ae783ad3ccd5b5b96af200d2eb618 /kernel/bpf | |
| parent | bee955cd3ab4f1a1eb8fc16e7ed69364143df8d7 (diff) | |
| download | linux-f3edacbd697f94a743fff1a3d26910ab99948ba7.tar.xz | |
bpf: Revert bpf_overrid_function() helper changes.
NACK'd by x86 maintainer.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/core.c | 3 | ||||
| -rw-r--r-- | kernel/bpf/verifier.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 271daad31f37..8a6c37762330 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -1326,9 +1326,6 @@ EVAL4(PROG_NAME_LIST, 416, 448, 480, 512) bool bpf_prog_array_compatible(struct bpf_array *array, const struct bpf_prog *fp) { - if (fp->kprobe_override) - return false; - if (!array->owner_prog_type) { /* There's no owner yet where we could check for * compatibility. diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index bc464b8ec91e..4a942e2e753d 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -4357,8 +4357,6 @@ static int fixup_bpf_calls(struct bpf_verifier_env *env) prog->dst_needed = 1; if (insn->imm == BPF_FUNC_get_prandom_u32) bpf_user_rnd_init_once(); - if (insn->imm == BPF_FUNC_override_return) - prog->kprobe_override = 1; if (insn->imm == BPF_FUNC_tail_call) { /* If we tail call into other programs, we * cannot make any assumptions since they can |