diff mbox

powerpc/sstep: Return directly after a failed address_ok() in emulate_step()

Message ID bc39d538-80f2-e810-0d58-39522605e067@users.sourceforge.net (mailing list archive)
State Accepted
Headers show

Commit Message

SF Markus Elfring Jan. 21, 2017, 2:45 p.m. UTC 
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 21 Jan 2017 15:30:15 +0100

* Return directly after a call of the function "address_ok" failed
  in a case block.

  This issue was detected by using the Coccinelle software.

* Delete two error code assignments which became unnecessary with
  this refactoring.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 arch/powerpc/lib/sstep.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Michael Ellerman Jan. 27, 2017, 12:40 a.m. UTC | #1 
On Sat, 2017-01-21 at 14:45:19 UTC, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sat, 21 Jan 2017 15:30:15 +0100
> 
> * Return directly after a call of the function "address_ok" failed
>   in a case block.
> 
>   This issue was detected by using the Coccinelle software.
> 
> * Delete two error code assignments which became unnecessary with
>   this refactoring.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/3c4b66a6d0d2b9f2418f9a09d528e4

cheers
diff mbox

Patch

diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index 9c78a9c102c3..c33519c25b47 100644
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -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: