summaryrefslogtreecommitdiffstats
path: root/arch/s390/net
diff options
context:
space:
mode:
authorMichael Holzheu <holzheu@linux.vnet.ibm.com>2015-01-15 10:21:20 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-01-15 11:10:33 +0100
commitd86eb7448e6de97b1319ea935f77b65590dbc049 (patch)
tree03fbcb37e572739c2b151b6e4d98b065330100ae /arch/s390/net
parentdb9aa8f432b83b270686e68172c6d2895babdc26 (diff)
downloadlinux-stable-d86eb7448e6de97b1319ea935f77b65590dbc049.tar.gz
linux-stable-d86eb7448e6de97b1319ea935f77b65590dbc049.tar.bz2
linux-stable-d86eb7448e6de97b1319ea935f77b65590dbc049.zip
s390/bpf: Fix offset parameter for skb_copy_bits()
Currently the offset parameter for skb_copy_bits is changed in sk_load_word() and sk_load_half(). Therefore it is not correct when calling skb_copy_bits(). Fix this and use the original offset for the function call. Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/net')
-rw-r--r--arch/s390/net/bpf_jit.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/net/bpf_jit.S b/arch/s390/net/bpf_jit.S
index d34b70767d5a..ede6108c0002 100644
--- a/arch/s390/net/bpf_jit.S
+++ b/arch/s390/net/bpf_jit.S
@@ -44,6 +44,7 @@ ENTRY(sk_load_word)
sk_load_word_slow:
lgr %r9,%r2 # save %r2
+ lgr %r3,%r1 # offset
la %r4,160(%r15) # pointer to temp buffer
lhi %r5,4 # 4 bytes
brasl %r14,skb_copy_bits # get data from skb
@@ -69,6 +70,7 @@ ENTRY(sk_load_half)
sk_load_half_slow:
lgr %r9,%r2 # save %r2
+ lgr %r3,%r1 # offset
la %r4,162(%r15) # pointer to temp buffer
lhi %r5,2 # 2 bytes
brasl %r14,skb_copy_bits # get data from skb