diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-02-02 13:23:36 +1100 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-02-02 13:23:42 +1100 |
| commit | f3f4aeb9ea8954c0da3cf0d12693f9a57f1f4ac7 (patch) | |
| tree | 3663ab29736373c565d88e941162d37311cc3c75 /arch/sparc | |
| parent | 2a3f5f14fdf2e8fb680af168fa642ef8a9218ffb (diff) | |
| parent | 849a2d3d9be31368559e6852cf64d749e6903818 (diff) | |
| download | talos-obmc-linux-openbmc-20160202-1.tar.gz talos-obmc-linux-openbmc-20160202-1.zip | |
Merge tag 'v4.3.5' into dev-4.3openbmc-20160202-1
This is the 4.3.5 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
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 f8b9f71b9a2b..17e71d2d96e5 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; |
