From 50e197a3c40907b2ca6d5a7aeb48a66e71e1b8c1 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Mon, 27 Sep 2010 20:32:19 +0200 Subject: [PATCH] --- yaml --- r: 211372 b: refs/heads/master c: a337fdac7a5622d1e6547f4b476c14dfe5a2c892 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/signal.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ed5181a99b12..2aa540c639d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67159813127309c1a65d86e40fa0368241fa668c +refs/heads/master: a337fdac7a5622d1e6547f4b476c14dfe5a2c892 diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index bded65187780..919562c3d6b7 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -2214,6 +2214,14 @@ int copy_siginfo_to_user(siginfo_t __user *to, siginfo_t *from) err |= __put_user(from->si_addr, &to->si_addr); #ifdef __ARCH_SI_TRAPNO err |= __put_user(from->si_trapno, &to->si_trapno); +#endif +#ifdef BUS_MCEERR_AO + /* + * Other callers might not initialize the si_lsb field, + * so check explicitely for the right codes here. + */ + if (from->si_code == BUS_MCEERR_AR || from->si_code == BUS_MCEERR_AO) + err |= __put_user(from->si_addr_lsb, &to->si_addr_lsb); #endif break; case __SI_CHLD: