diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-15 03:42:44 +0300 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-15 03:42:44 +0300 |
commit | 2692a71bbd40160165e89d5505c5c28144ec5a42 (patch) | |
tree | acaaf0f1a4942486109094acad37c29456aeda98 /arch/alpha/lib/ev6-copy_user.S | |
parent | 7041c57709efdc1e31aaff663cfe17f0b21f4743 (diff) | |
parent | b065444286bed7ec49ee81c593a46f3031fbfc83 (diff) | |
download | linux-2692a71bbd40160165e89d5505c5c28144ec5a42.tar.xz |
Merge branch 'work.uaccess' into for-linus
Diffstat (limited to 'arch/alpha/lib/ev6-copy_user.S')
-rw-r--r-- | arch/alpha/lib/ev6-copy_user.S | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/arch/alpha/lib/ev6-copy_user.S b/arch/alpha/lib/ev6-copy_user.S index db42ffe9c350..c4d0689c3d26 100644 --- a/arch/alpha/lib/ev6-copy_user.S +++ b/arch/alpha/lib/ev6-copy_user.S @@ -227,33 +227,12 @@ $dirtyentry: bgt $0,$onebyteloop # U .. .. .. : U L U L $zerolength: +$exitin: $exitout: # Destination for exception recovery(?) nop # .. .. .. E nop # .. .. E .. nop # .. E .. .. ret $31,($28),1 # L0 .. .. .. : L U L U -$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. */ - - nop - nop - nop - mov $0,$1 - -$101: - EXO ( stb $31,0($6) ) # L - subq $1,1,$1 # E - addq $6,1,$6 # E - bgt $1,$101 # U - - nop - nop - nop - ret $31,($28),1 # L0 - .end __copy_user |