evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CRIS: __do_strncpy_from_user: Don't read the byte beyond the nil

Browse source 
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
This commit is contained in:
Jesper Nilsson 2010-08-03 19:14:29 +02:00
parent 2dc1c40c6e
commit da2af0a771
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/cris/include/arch-v32/arch/uaccess.h
View file

@ -122,14 +122,14 @@ __do_strncpy_from_user(char *dst, const char *src, long count)
__asm__ __volatile__ ( __asm__ __volatile__ (
" move.d %3,%0\n" " move.d %3,%0\n"
"5: move.b [%2+],$acr\n" "5: move.b [%2+],$acr\n"
"1: beq 2f\n" "1: beq 6f\n"
" move.b $acr,[%1+]\n" " move.b $acr,[%1+]\n"
" subq 1,%0\n" " subq 1,%0\n"
"2: bne 1b\n" "2: bne 1b\n"
" move.b [%2+],$acr\n" " move.b [%2+],$acr\n"
" sub.d %3,%0\n" "6: sub.d %3,%0\n"
" neg.d %0,%0\n" " neg.d %0,%0\n"
"3:\n" "3:\n"
" .section .fixup,\"ax\"\n" " .section .fixup,\"ax\"\n"
@ -140,8 +140,7 @@ __do_strncpy_from_user(char *dst, const char *src, long count)
/* The address for a fault at the first move is trivial. /* The address for a fault at the first move is trivial.
The address for a fault at the second move is that of The address for a fault at the second move is that of
the preceding branch insn, since the move insn is in the preceding branch insn, since the move insn is in
its delay-slot. That address is also a branch its delay-slot. Just so you don't get confused... */
target. Just so you don't get confused... */
" .previous\n" " .previous\n"
" .section __ex_table,\"a\"\n" " .section __ex_table,\"a\"\n"
" .dword 5b,4b\n" " .dword 5b,4b\n"