X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=fs%2Fsignalfd.c;h=492465b451ddd34f6f60214fb48224687649faa9;hb=24b7ea9f6c9787fad885442ed0cc010f1aa69cca;hp=74047304b01a4300bf7f781ad4d2838dc3bc316b;hpb=1dfd166e93f98892aa4427069a23ed73259983c8;p=net-next-2.6.git diff --git a/fs/signalfd.c b/fs/signalfd.c index 74047304b01..492465b451d 100644 --- a/fs/signalfd.c +++ b/fs/signalfd.c @@ -98,6 +98,16 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo, err |= __put_user((long) kinfo->si_addr, &uinfo->ssi_addr); #ifdef __ARCH_SI_TRAPNO err |= __put_user(kinfo->si_trapno, &uinfo->ssi_trapno); +#endif +#ifdef BUS_MCEERR_AO + /* + * Other callers might not initialize the si_lsb field, + * so check explicitly for the right codes here. + */ + if (kinfo->si_code == BUS_MCEERR_AR || + kinfo->si_code == BUS_MCEERR_AO) + err |= __put_user((short) kinfo->si_addr_lsb, + &uinfo->ssi_addr_lsb); #endif break; case __SI_CHLD: