[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20101008173229.GH13352@basil.fritz.box>
Date: Fri, 8 Oct 2010 19:32:29 +0200
From: Andi Kleen <andi@...stfloor.org>
To: Ralf Baechle <ralf@...ux-mips.org>
Cc: Andi Kleen <andi@...stfloor.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
linux-kernel@...r.kernel.org, fengguang.wu@...el.com,
linux-mm@...ck.org, Andi Kleen <ak@...ux.intel.com>,
Manuel Lauss <manuel.lauss@...glemail.com>,
linux-mips@...ux-mips.org, tony.luck@...el.com
Subject: Re: [PATCH 2/4] HWPOISON: Copy si_addr_lsb to user
On Fri, Oct 08, 2010 at 06:09:41PM +0100, Ralf Baechle wrote:
> > --- 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
>
> include/asm-generic/siginfo.h defines BUS_MCEERR_AR unconditionally and is
> getting include in all <asm/siginfo.h> so that #ifdef condition is always
> true. struct siginfo.si_addr_lsb is defined only for the generic struct
> siginfo. The architectures that define HAVE_ARCH_SIGINFO_T (MIPS and
> IA-64) do not define this field so the build breaks.
Oops. I see two possible solutions:
#undef BUS_MCEERR_AR in the ia64 and mips siginfo.h or simply
add the si_addr_lsb field there too (it just sits over padding
and should be harmless)
What do you prefer?
-Andi
--
ak@...ux.intel.com -- Speaking for myself only.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists