lwn.git/arch/m68k/kernel/signal.c, branch v3.2.2

m68k: merge m68k and m68knommu arch directories

2011-03-25T04:05:13+00:00

There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King , which was originally written by Arnd Bergmann . > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > _mm. and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed _no. and a small > wrapper file . is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include _mm. > #else > #include _no. > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer

m68k: Add helper function handle_kernel_fault()

2011-03-16T18:10:40+00:00

Add helper function handle_kernel_fault() in signal.c, so frame_extra_sizes can become static, and to avoid future code duplication. Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven

m68k: Check __get_user()/__put_user() return value

2011-01-07T13:01:35+00:00

Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven

m68k: Fix stack mangling logics in sigreturn

2011-01-07T13:01:35+00:00

a) we should hold modifying regs->format until we know we *will* be doing stack expansion; otherwise attacker can modify sigframe to have wrong ->sc_formatvec and install SIGSEGV handler. b) we should *not* mix copying saved extra stuff from userland with expanding the stack; once we'd done that manual memmove, we'd better not return to C, so cleanup is very hard to do. The easiest way is to copy it on stack first, making sure we won't overwrite on stack expansion. Fortunately that's easy to do... Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven

m68k: If we fail to set sigframe up, just leave regs alone...

2011-01-07T13:01:34+00:00

Same principle as with the previous patch - do not destroy the state if sigframe setup fails. Incidentally, it's actually _less_ work - we don't need to go through adjust_stack dance on failure if we don't touch regs->stkadj until we know we'd written sigframe out. Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven

m68k: Don't lose state if sigframe setup fails

2011-01-07T13:01:34+00:00

If we'd failed in setup_frame(), we've no place to store the original sigmask. It's not an unrecoverable situation - we raise SIGSEGV, but that SIGSEGV might be successfully handled (e.g. on altstack). In that case we really don't want sa_mask of original signal permanently slapped on the set of blocked signals. Standard solution: have setup_frame()/setup_rt_frame() report failure and don't mess with the signal-related state if that has happened... Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven

m68k: Simplify the singlestepping handling in signals

2011-01-07T13:01:34+00:00

Instead of checking the return value of do_signal() we can just do the work (raise SIGTRAP and clear SR.T1) directly in handle_signal(), when setting the sigframe up. Simplifies the assembler glue and is closer to the way we do it on other targets. Note that do_delayed_trace does *not* disappear; it's still needed to deal with single-stepping through syscall, since 68040 doesn't raise the trace exception at all if the trap exception is pending. We hit it after returning from sys_...() if TIF_DELAYED_TRACE is set; all that has changed is that we don't reuse it for "single-step into the handler" codepath. As the result, do_signal() doesn't need to return anything anymore. Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven

m68k: Switch to saner sigsuspend()

2011-01-07T13:01:33+00:00

and saner do_signal() arguments, while we are at it Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven

m68k: Resetting sa_handler in local copy of k_sigaction is pointless

2011-01-07T12:59:59+00:00

... and had been such since the introduction of get_signal_to_deliver() Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven

m68k: Define sigcontext ABI of ColdFire

2010-02-27T17:44:10+00:00

The following patch defines sigcontext ABI of ColdFire. Due to ISA restrictions ColdFire needs different rt_sigreturn trampoline. And due to ColdFire FP registers being 8-bytes instead of 12-bytes on m68k, sigcontext and fpregset structures should be updated. Regarding the sc_fpstate[16+6*8] field, it would've been enough 16 bytes to store ColdFire's FP state. To accomodate GLIBC's libSegFault it would'be been enough 6*8 bytes (room for the 6 non-call-clobbered FP registers). I set it to 16+6*8 to provide some extra space for any future changes in the ColdFire FPU. Signed-off-by: Maxim Kuvyrkov Signed-off-by: Geert Uytterhoeven