Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34b74c32 authored by Heiko Carstens's avatar Heiko Carstens Committed by Greg Kroah-Hartman
Browse files

s390/ptrace: fix PTRACE_GET_LAST_BREAK error handling 



[ Upstream commit f9bbf25e7b2b74b52b2f269216a92657774f239c ]

Return -EFAULT if put_user() for the PTRACE_GET_LAST_BREAK
request fails, instead of silently ignoring it.

Reviewed-by: default avatarSven Schnelle <svens@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 64cd99da

arch/s390/kernel/ptrace.c

+2 −6
Original line number Diff line number Diff line
@@ -502,9 +502,7 @@ long arch_ptrace(struct task_struct *child, long request, 
		}

		return 0;

	case PTRACE_GET_LAST_BREAK:

		put_user(child->thread.last_break,

			 (unsigned long __user *) data);

		return 0;

		return put_user(child->thread.last_break, (unsigned long __user *)data);

	case PTRACE_ENABLE_TE:

		if (!MACHINE_HAS_TE)

			return -EIO;
@@ -856,9 +854,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 
		}

		return 0;

	case PTRACE_GET_LAST_BREAK:

		put_user(child->thread.last_break,

			 (unsigned int __user *) data);

		return 0;

		return put_user(child->thread.last_break, (unsigned int __user *)data);

	}

	return compat_ptrace_request(child, request, addr, data);

}