summaryrefslogtreecommitdiffstats
path: root/arch/alpha/lib/copy_user.S
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-10-15 02:42:44 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2016-10-15 02:42:44 +0200
commit2692a71bbd40160165e89d5505c5c28144ec5a42 (patch)
treeacaaf0f1a4942486109094acad37c29456aeda98 /arch/alpha/lib/copy_user.S
parentscore: traps: Add missing include file to fix build error (diff)
parentblackfin: no access_ok() for __copy_{to,from}_user() (diff)
downloadlinux-2692a71bbd40160165e89d5505c5c28144ec5a42.tar.xz
linux-2692a71bbd40160165e89d5505c5c28144ec5a42.zip
Merge branch 'work.uaccess' into for-linus
Diffstat (limited to 'arch/alpha/lib/copy_user.S')
-rw-r--r--arch/alpha/lib/copy_user.S16
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/alpha/lib/copy_user.S b/arch/alpha/lib/copy_user.S
index 6f3fab9eb434..ac9c3766ba8c 100644
--- a/arch/alpha/lib/copy_user.S
+++ b/arch/alpha/lib/copy_user.S
@@ -124,22 +124,8 @@ $65:
bis $31,$31,$0
$41:
$35:
-$exitout:
- ret $31,($28),1
-
$exitin:
- /* A stupid byte-by-byte zeroing of the rest of the output
- buffer. This cures security holes by never leaving
- random kernel data around to be copied elsewhere. */
-
- mov $0,$1
-$101:
- EXO ( ldq_u $2,0($6) )
- subq $1,1,$1
- mskbl $2,$6,$2
- EXO ( stq_u $2,0($6) )
- addq $6,1,$6
- bgt $1,$101
+$exitout:
ret $31,($28),1
.end __copy_user