On Mon, 22 Apr 2024, Michael Schmitz wrote:
As mentioned by Finn Thain in his patch to improve put_user exception
handling on 040, a similar problem exists on 030 processors.
A moves instruction that crosses a page boundary from a mapped page into
an unmapped one will cause a mid-instruction bus error exception (frame
format b), with the PC pointing (usually) two instructions past the
faulting movesl instruction.
Our exception handling in __generic_copy_to_user only covers the
instruction immediately following the faulting one. As a result,
fixup_exception in send_fault_sig does not detect this case, and cause
send_fault_sig to oops.
Extend the exception table to cover one additional instruction beyond
the moves[lwb] instructions.
Tested on 68030 (Atari Falcon 030) with a transfer beginning at a single
byte at the end of a mapped page followed by further bytes on an
unmapped page (testcase derived from stress-ng sysbadaddr stressor by
Finn Thain).
A similar problem exists in __clear_user(); modify the exception table
for that function in the same way (untested)
I've just tested this on a Motorola 68040 and I got an oops in
__generic_copy_to_user(). It appears that we need more entries in the
exception table. (I also tested in QEMU and it did not oops.)
This oops indicates that we are going to need the final NOP that was in
the first version of your patch. My test program seems inadequate to show
that it is safe to omit that NOP -- we would need a test which doesn't
jump over the MOVES.B.
Unable to handle kernel access at virtual address c0029000
Oops: 00000000
Modules linked in:
PC: [<0046454c>] __generic_copy_to_user+0x48/0x5c
SR: 2000 SP: 0152df10 a2: 01502160
d0: 00000000 d1: 00000001 d2: 2f746d70 d3: c0028fff
d4: 00000400 d5: c0028fff a0: c0029003 a1: 0081bfff
Process badaddr-3syscal (pid: 83, task=01502160)
Frame format=7 eff addr=0152df6c ssw=0c81 faddr=c0028fff
wb 1 stat/addr/data: 0001 20000046 fcae0008
wb 2 stat/addr/data: 0081 c0028fff 2f746d70
wb 3 stat/addr/data: 0045 0152df64 2f746d70
push data: fcae0008 00000005 0152df88 0046451e
Stack from 0152df78:
c0028fff 00000005 00000005 0081b000 0152dfc4 00128cf6 c0028fff 0081bffb
00000005 00000400 efd92d5c 8000087a 8000408c 0099dd90 00c29900 0099d910
00c0c400 0081bffb 00000ffb efd92d48 000027a2 c0028fff 00000400 efd92d5c
8000087a 8000408c 8000408c 00000000 efd92ea4 ffffffda 000000b7 00000000
0000c011 a5100080
Call Trace: [<00128cf6>] sys_getcwd+0xc8/0x15a
[<000027a2>] syscall+0x8/0xc
[<0000c011>] mac_reset+0x16d/0x170
Code: 0001 6706 3419 0e58 2800 0801 0000 6706 <1419> 0e18 2800 242e fff8 262e fffc 4e5e 4e75 4e75 4e56 0000 48e7 2018 242e 0008
Disabling lock debugging due to kernel taint
00464504 <__generic_copy_to_user>:
464504: 4e56 0000 linkw %fp,#0
464508: 2f03 movel %d3,%sp@-
46450a: 2f02 movel %d2,%sp@-
46450c: 262e 0008 movel %fp@(8),%d3
464510: 242e 0010 movel %fp@(16),%d2
464514: 2f02 movel %d2,%sp@-
464516: 2f03 movel %d3,%sp@-
464518: 4eb9 0046 44c6 jsr 4644c6 <__clear_user>
46451e: 2002 movel %d2,%d0
464520: e488 lsrl #2,%d0
464522: 7203 moveq #3,%d1
464524: c282 andl %d2,%d1
464526: 226e 000c moveal %fp@(12),%a1
46452a: 2043 moveal %d3,%a0
46452c: 4a80 tstl %d0
46452e: 670a beqs 46453a <__generic_copy_to_user+0x36>
464530: 2419 movel %a1@+,%d2
464532: 0e98 2800 movesl %d2,%a0@+
464536: 5380 subql #1,%d0
464538: 66f6 bnes 464530 <__generic_copy_to_user+0x2c>
46453a: 0801 0001 btst #1,%d1
46453e: 6706 beqs 464546 <__generic_copy_to_user+0x42>
464540: 3419 movew %a1@+,%d2
464542: 0e58 2800 movesw %d2,%a0@+
464546: 0801 0000 btst #0,%d1
46454a: 6706 beqs 464552 <__generic_copy_to_user+0x4e>
46454c: 1419 moveb %a1@+,%d2
46454e: 0e18 2800 movesb %d2,%a0@+
464552: 242e fff8 movel %fp@(-8),%d2
464556: 262e fffc movel %fp@(-4),%d3
46455a: 4e5e unlk %fp
46455c: 4e75 rts
46455e: 4e75 rts
