diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-02 07:13:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-02 07:13:38 +0100 |
| commit | ff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch) | |
| tree | 93bd6152d9fa28348be99ef1c788040cc7b7a94d /arch/arm/kernel | |
| parent | net: remove [un]register_pernet_gen_... and update the docs. (diff) | |
| parent | ip_fragment: also adjust skb->truesize for packets not owned by a socket (diff) | |
| download | linux-ff9c38bba37937adb909cceb2a6521f2e92e17c6.tar.xz linux-ff9c38bba37937adb909cceb2a6521f2e92e17c6.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/ht.c
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/signal.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 2a573d4fea24..e7714f367eb8 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -662,8 +662,12 @@ static void do_signal(struct pt_regs *regs, int syscall) regs->ARM_sp -= 4; usp = (u32 __user *)regs->ARM_sp; - put_user(regs->ARM_pc, usp); - regs->ARM_pc = KERN_RESTART_CODE; + if (put_user(regs->ARM_pc, usp) == 0) { + regs->ARM_pc = KERN_RESTART_CODE; + } else { + regs->ARM_sp += 4; + force_sigsegv(0, current); + } #endif } } |