diff options
| author | Andi Kleen <ak@linux.intel.com> | 2010-09-27 20:32:19 +0200 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2010-10-07 09:41:25 +0200 |
| commit | a337fdac7a5622d1e6547f4b476c14dfe5a2c892 (patch) | |
| tree | 2c4072b1188235f348f4ee58e18a027ec61ea4dc /kernel/signal.c | |
| parent | 67159813127309c1a65d86e40fa0368241fa668c (diff) | |
| download | linux-a337fdac7a5622d1e6547f4b476c14dfe5a2c892.tar.gz linux-a337fdac7a5622d1e6547f4b476c14dfe5a2c892.tar.bz2 linux-a337fdac7a5622d1e6547f4b476c14dfe5a2c892.zip | |
HWPOISON: Copy si_addr_lsb to user
The original hwpoison code added a new siginfo field si_addr_lsb to
pass the granuality of the fault address to user space. Unfortunately
this field was never copied to user space. Fix this here.
I added explicit checks for the MCEERR codes to avoid having
to patch all potential callers to initialize the field.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index bded65187780..919562c3d6b7 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2215,6 +2215,14 @@ int copy_siginfo_to_user(siginfo_t __user *to, siginfo_t *from) #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: err |= __put_user(from->si_pid, &to->si_pid); |