leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MIPS: Fix strnlen_user() return value in case of overlong strings.

Browse Source 
We were returning maxlen like the userland strnlen if no '\0' character
was encountered while the kernel version is expected to return a value
larger than maxlen.  Fixed to return maxlen + 1.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2014-11-04 11:54:29 +01:00
parent 30fa0530ff
commit 0097761013
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/mips/lib/strnlen_user.S
View File

@ -40,9 +40,11 @@ FEXPORT(__strnlen_\func\()_nocheck_asm)
.else .else
EX(lbe, t0, (v0), .Lfault\@) EX(lbe, t0, (v0), .Lfault\@)
.endif .endif
PTR_ADDIU v0, 1 .set noreorder
bnez t0, 1b bnez t0, 1b
1: PTR_SUBU v0, a0 1: PTR_ADDIU v0, 1
.set reorder
PTR_SUBU v0, a0
jr ra jr ra
END(__strnlen_\func\()_asm) END(__strnlen_\func\()_asm)