Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

MIPS: lib: strncpy_user: Use macro to build the strncpy_from_user symbol

Browse source 
Build the __strncpy_from_user symbol using a macro. In EVA mode we will
need to use similar code to do the userspace load operations so
it is better if we use a macro to avoid code duplications.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
This commit is contained in:
Markos Chandras 2014-01-02 16:36:49 +00:00 committed by Ralf Baechle
parent 053970542f
commit cc59fe5b88
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
arch/mips/lib/strncpy_user.S
View file

@ -28,16 +28,17 @@
* it happens at most some bytes of the exceptions handlers will be copied. * it happens at most some bytes of the exceptions handlers will be copied.
*/ */
LEAF(__strncpy_from_user_asm) .macro __BUILD_STRNCPY_ASM func
LEAF(__strncpy_from_\func\()_asm)
LONG_L v0, TI_ADDR_LIMIT($28) # pointer ok? LONG_L v0, TI_ADDR_LIMIT($28) # pointer ok?
and v0, a1 and v0, a1
bnez v0, .Lfault bnez v0, .Lfault\@
FEXPORT(__strncpy_from_user_nocheck_asm) FEXPORT(__strncpy_from_\func\()_nocheck_asm)
.set noreorder .set noreorder
move t0, zero move t0, zero
move v1, a1 move v1, a1
1: EX(lbu, v0, (v1), .Lfault) 1: EX(lbu, v0, (v1), .Lfault\@)
PTR_ADDIU v1, 1 PTR_ADDIU v1, 1
R10KCBARRIER(0(ra)) R10KCBARRIER(0(ra))
beqz v0, 2f beqz v0, 2f
@ -47,15 +48,19 @@ FEXPORT(__strncpy_from_user_nocheck_asm)
PTR_ADDIU a0, 1 PTR_ADDIU a0, 1
2: PTR_ADDU v0, a1, t0 2: PTR_ADDU v0, a1, t0
xor v0, a1 xor v0, a1
bltz v0, .Lfault bltz v0, .Lfault\@
nop nop
jr ra # return n jr ra # return n
move v0, t0 move v0, t0
END(__strncpy_from_user_asm) END(__strncpy_from_\func\()_asm)
.Lfault: jr ra .Lfault\@: jr ra
li v0, -EFAULT li v0, -EFAULT
.section __ex_table,"a" .section __ex_table,"a"
PTR 1b, .Lfault PTR 1b, .Lfault\@
.previous .previous
.endm
__BUILD_STRNCPY_ASM user