Commit e77b3496 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Adrian Bunk

[S390] fix user readable uninitialised kernel memory, take 2.

The previous patch to correct the copy_from_user padding is quite
broken. The execute instruction needs to be done via the register %r4,
not via %r2 and 31 bit doesn't know the instructions lgr and ahji.
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
parent dfa2e9e7
...@@ -41,15 +41,15 @@ __copy_from_user_asm: ...@@ -41,15 +41,15 @@ __copy_from_user_asm:
5: mvcp 0(%r5,%r2),0(%r4),%r0 5: mvcp 0(%r5,%r2),0(%r4),%r0
slr %r3,%r5 slr %r3,%r5
alr %r2,%r5 alr %r2,%r5
6: lgr %r5,%r3 # copy remaining size 6: lr %r5,%r3 # copy remaining size
ahi %r5,-1 # subtract 1 for xc loop ahi %r5,-1 # subtract 1 for xc loop
bras %r4,8f bras %r4,8f
xc 0(1,%2),0(%2) xc 0(1,%r2),0(%r2)
7: xc 0(256,%2),0(%2) 7: xc 0(256,%r2),0(%r2)
la %r2,256(%r2) la %r2,256(%r2)
8: ahji %r5,-256 8: ahi %r5,-256
jnm 7b jnm 7b
ex %r5,0(%r2) ex %r5,0(%r4)
9: lr %r2,%r3 9: lr %r2,%r3
br %r14 br %r14
.section __ex_table,"a" .section __ex_table,"a"
......
...@@ -49,7 +49,7 @@ __copy_from_user_asm: ...@@ -49,7 +49,7 @@ __copy_from_user_asm:
la %r2,256(%r2) la %r2,256(%r2)
8: aghi %r5,-256 8: aghi %r5,-256
jnm 7b jnm 7b
ex %r5,0(%r2) ex %r5,0(%r4)
9: lgr %r2,%r3 9: lgr %r2,%r3
br %r14 br %r14
.section __ex_table,"a" .section __ex_table,"a"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment