diff options
| author | David S. Miller <davem@davemloft.net> | 2016-01-06 22:54:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-06 22:54:18 -0500 |
| commit | 9e0efaf6b41bf22c2eb81258fc2a6f1538a643e5 (patch) | |
| tree | e2daa5fb47f707f44b6b7e9da82a6d8017af3f8c /arch/sparc | |
| parent | c7f5d105495a38ed09e70d825f75d9d7d5407264 (diff) | |
| parent | 51cb67c0b0fcb91581b15bd2e85f29af4d4b2df6 (diff) | |
| download | blackbird-op-linux-9e0efaf6b41bf22c2eb81258fc2a6f1538a643e5.tar.gz blackbird-op-linux-9e0efaf6b41bf22c2eb81258fc2a6f1538a643e5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/net/bpf_jit_comp.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c index 22564f5f2364..3e6e05a7c4c2 100644 --- a/arch/sparc/net/bpf_jit_comp.c +++ b/arch/sparc/net/bpf_jit_comp.c @@ -420,22 +420,9 @@ void bpf_jit_compile(struct bpf_prog *fp) } emit_reg_move(O7, r_saved_O7); - switch (filter[0].code) { - case BPF_RET | BPF_K: - case BPF_LD | BPF_W | BPF_LEN: - case BPF_LD | BPF_W | BPF_ABS: - case BPF_LD | BPF_H | BPF_ABS: - case BPF_LD | BPF_B | BPF_ABS: - /* The first instruction sets the A register (or is - * a "RET 'constant'") - */ - break; - default: - /* Make sure we dont leak kernel information to the - * user. - */ + /* Make sure we dont leak kernel information to the user. */ + if (bpf_needs_clear_a(&filter[0])) emit_clear(r_A); /* A = 0 */ - } for (i = 0; i < flen; i++) { unsigned int K = filter[i].k; |
