lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] Alpha: strncpy() fix

Browse Source 
As it turned out after recent SCSI changes, strncpy() was broken -
it mixed up the return values from __stxncpy() in registers $24 and $27.

Thanks to Mathieu Chouquet-Stringer for tracking down the problem
and providing an excellent test case.

Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ivan Kokshaysky
2006-04-25 13:45:19 +04:00
committed by Linus Torvalds
parent 454ac77845
commit 4d5c34ec7b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/alpha/lib/strncpy.S
View File

@@ -43,8 +43,8 @@ strncpy:
.align 4 .align 4
$multiword: $multiword:
subq $24, 1, $2 # clear the final bits in the prev word subq $27, 1, $2 # clear the final bits in the prev word
or $2, $24, $2 or $2, $27, $2
zapnot $1, $2, $1 zapnot $1, $2, $1
subq $18, 1, $18 subq $18, 1, $18
@@ -70,8 +70,8 @@ $multiword:
bne $18, 0b bne $18, 0b
1: ldq_u $1, 0($16) # clear the leading bits in the final word 1: ldq_u $1, 0($16) # clear the leading bits in the final word
subq $27, 1, $2 subq $24, 1, $2
or $2, $27, $2 or $2, $24, $2
zap $1, $2, $1 zap $1, $2, $1
stq_u $1, 0($16) stq_u $1, 0($16)