aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/lib/csum-copy.S
diff options
context:
space:
mode:
authorDave Peterson <dsp@llnl.gov>2005-07-30 01:59:20 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-30 13:14:47 -0400
commit92ed0223aefa795d1873427e25599cb70b2148ee (patch)
tree1ecb618129bba703034bbb03223acbb977d55761 /arch/x86_64/lib/csum-copy.S
parent5ce17b18e16177dd6409dabd38df5c2c9b58fc2d (diff)
[PATCH] x86_64: fix bug in csum_partial_copy_generic()
I was observing reproducible crashes on the "movw %bx,(%rsi)" instruction below while a process in a recvfrom() system call was copying packet data to user space. The patch below fixes the exception table and causes the crash to no longer reproduce. Please apply. Acked-by: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/lib/csum-copy.S')
-rw-r--r--arch/x86_64/lib/csum-copy.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/lib/csum-copy.S b/arch/x86_64/lib/csum-copy.S
index 01808ec37836..72fd55ee896e 100644
--- a/arch/x86_64/lib/csum-copy.S
+++ b/arch/x86_64/lib/csum-copy.S
@@ -188,8 +188,8 @@ csum_partial_copy_generic:
188 source 188 source
189 movw (%rdi),%bx 189 movw (%rdi),%bx
190 adcl %ebx,%eax 190 adcl %ebx,%eax
191 dest
192 decl %ecx 191 decl %ecx
192 dest
193 movw %bx,(%rsi) 193 movw %bx,(%rsi)
194 leaq 2(%rdi),%rdi 194 leaq 2(%rdi),%rdi
195 leaq 2(%rsi),%rsi 195 leaq 2(%rsi),%rsi