]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
powerpc/sstep: Return directly after a failed address_ok() in emulate_step()
authorMarkus Elfring <elfring@users.sourceforge.net>
Sat, 21 Jan 2017 14:30:15 +0000 (15:30 +0100)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 25 Jan 2017 02:34:21 +0000 (13:34 +1100)
Setting err and going to ldst_done just returns 0, without using err, so
just return 0 directly. We already do that for other call sites in this
function.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
[mpe: Rewrite change log]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/lib/sstep.c

index 06c7e9b884083f3c6423de1d5de61e2d6d93260e..846dba2c6360002b5343dc17d5b0744fb5525e85 100644 (file)
@@ -1803,9 +1803,8 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                        return 0;
                if (op.ea & (size - 1))
                        break;          /* can't handle misaligned */
-               err = -EFAULT;
                if (!address_ok(regs, op.ea, size))
-                       goto ldst_done;
+                       return 0;
                err = 0;
                switch (size) {
                case 4:
@@ -1828,9 +1827,8 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                        return 0;
                if (op.ea & (size - 1))
                        break;          /* can't handle misaligned */
-               err = -EFAULT;
                if (!address_ok(regs, op.ea, size))
-                       goto ldst_done;
+                       return 0;
                err = 0;
                switch (size) {
                case 4: