diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-02 09:25:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-02 09:25:32 -0700 |
| commit | b28e4f08d43beca4ac8ba2f768f4aaa8b056c4cf (patch) | |
| tree | a80ab6bd7587948a028cc9c689339c4bfb57b7f2 /arch | |
| parent | b7270cce7db770602510043b212992d839fd25a6 (diff) | |
| parent | 6e0de817594c61f3b392a9245deeb09609ec707d (diff) | |
| download | linux-b28e4f08d43beca4ac8ba2f768f4aaa8b056c4cf.tar.gz linux-b28e4f08d43beca4ac8ba2f768f4aaa8b056c4cf.tar.bz2 linux-b28e4f08d43beca4ac8ba2f768f4aaa8b056c4cf.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Two bug fixes, one to fix a potential information leak in the BPF jit
and common-io-layer fix for old firmware levels"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/bpf,jit: initialize A register if 1st insn is BPF_S_LDX_B_MSH
s390/chsc: fix SEI usage on old FW levels
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/net/bpf_jit_comp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 9c36dc398f90..452d3ebd9d0f 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -276,7 +276,6 @@ static void bpf_jit_noleaks(struct bpf_jit *jit, struct sock_filter *filter) case BPF_S_LD_W_IND: case BPF_S_LD_H_IND: case BPF_S_LD_B_IND: - case BPF_S_LDX_B_MSH: case BPF_S_LD_IMM: case BPF_S_LD_MEM: case BPF_S_MISC_TXA: |