p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

powerpc: Fix Oops in rtas_stop_self() 

commit 41dd03a9 may cause Oops in rtas_stop_self().

The reason is that the rtas_args was moved into stack space. For a box
with more that 4GB RAM, the stack could easily be outside 32bit range,
but RTAS is 32bit.

So the patch moves rtas_args away from stack by adding static before
it.

Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Cc: stable@vger.kernel.org # 3.14+
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Li Zhong 2014-04-28 08:29:51 +08:00 committed by Benjamin Herrenschmidt
parent 28ea3c7529
commit 4fb8d027dc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/platforms/pseries/hotplug-cpu.c
View File

@ -88,13 +88,14 @@ void set_default_offline_state(int cpu)
static void rtas_stop_self(void) static void rtas_stop_self(void)
{ {
struct rtas_args args = { static struct rtas_args args = {
.token = cpu_to_be32(rtas_stop_self_token),
.nargs = 0, .nargs = 0,
.nret = 1, .nret = 1,
.rets = &args.args[0], .rets = &args.args[0],
}; };
args.token = cpu_to_be32(rtas_stop_self_token);
local_irq_disable(); local_irq_disable();
BUG_ON(rtas_stop_self_token == RTAS_UNKNOWN_SERVICE); BUG_ON(rtas_stop_self_token == RTAS_UNKNOWN_SERVICE);