Merge branch 'linus' into x86/cleanups

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index c680f1bbd387..1f8505c23548 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -792,6 +792,9 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
         if (args.token == RTAS_UNKNOWN_SERVICE)
                 return -EINVAL;
 
+        args.rets = &args.args[nargs];
+        memset(args.rets, 0, args.nret * sizeof(rtas_arg_t));
+
         /* Need to handle ibm,suspend_me call specially */
         if (args.token == ibm_suspend_me_token) {
                 rc = rtas_ibm_suspend_me(&args);
@@ -808,8 +811,6 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
         enter_rtas(__pa(&rtas.args));
         args = rtas.args;
 
-        args.rets = &args.args[nargs];
-
         /* A -1 return code indicates that the last command couldn't
            be completed due to a hardware error. */
         if (args.rets[0] == -1)