Rename ptrace_context() to get_ptrace_context() and use it for better
code readability. (I know it doesn't take a ref or anything; feel free to
ignore)
Signed-off-by: Ananth N Mavinakayanahalli <ana...@in.ibm.com>
---
kernel/ptrace.c | 40 +++++++++++++++++++++-------------------
1 file changed, 21 insertions(+), 19 deletions(-)
Index: ptrace-13oct/kernel/ptrace.c
===================================================================
--- ptrace-13oct.orig/kernel/ptrace.c
+++ ptrace-13oct/kernel/ptrace.c
@@ -59,7 +59,7 @@ static inline void set_stop_code(struct
}
static inline struct ptrace_context *
-ptrace_context(struct utrace_engine *engine)
+get_ptrace_context(struct utrace_engine *engine)
{
return engine->data;
}
@@ -124,7 +124,7 @@ static u32 ptrace_report_exit(enum utrac
struct task_struct *task,
long orig_code, long *code)
{
- struct ptrace_context *context = ptrace_context(engine);
+ struct ptrace_context *context = get_ptrace_context(engine);
WARN_ON(ptrace_event_pending(context));
@@ -171,7 +171,7 @@ static u32 ptrace_report_clone(enum utra
unsigned long clone_flags,
struct task_struct *child)
{
- struct ptrace_context *context = ptrace_context(engine);
+ struct ptrace_context *context = get_ptrace_context(engine);
int event, ret = UTRACE_RESUME;
WARN_ON(ptrace_event_pending(context));
@@ -227,7 +227,7 @@ static u32 ptrace_report_syscall_entry(u
struct task_struct *task,
struct pt_regs *regs)
{
- struct ptrace_context *context = ptrace_context(engine);
+ struct ptrace_context *context = get_ptrace_context(engine);
WARN_ON(ptrace_event_pending(context));
@@ -241,7 +241,7 @@ static u32 ptrace_report_syscall_exit(en
struct task_struct *task,
struct pt_regs *regs)
{
- struct ptrace_context *context = ptrace_context(engine);
+ struct ptrace_context *context = get_ptrace_context(engine);
if (ptrace_event_pending(context))
return UTRACE_STOP;
@@ -258,7 +258,7 @@ static u32 ptrace_report_exec(enum utrac
const struct linux_binprm *bprm,
struct pt_regs *regs)
{
- struct ptrace_context *context = ptrace_context(engine);
+ struct ptrace_context *context = get_ptrace_context(engine);
WARN_ON(ptrace_event_pending(context));
@@ -316,7 +316,7 @@ static u32 ptrace_report_signal(u32 acti
const struct k_sigaction *orig_ka,
struct k_sigaction *return_ka)
{
- struct ptrace_context *context = ptrace_context(engine);
+ struct ptrace_context *context = get_ptrace_context(engine);
enum utrace_resume_action resume = context->resume;
if (ptrace_event_pending(context)) {
@@ -367,7 +367,7 @@ static u32 ptrace_report_quiesce(u32 act
struct task_struct *task,
unsigned long event)
{
- struct ptrace_context *context = ptrace_context(engine);
+ struct ptrace_context *context = get_ptrace_context(engine);
if (ptrace_event_pending(context))
return UTRACE_STOP;
@@ -395,7 +395,7 @@ static inline int __ptrace_set_options(s
struct utrace_engine *engine,
unsigned long options)
{
- struct ptrace_context *context = ptrace_context(engine);
+ struct ptrace_context *context = get_ptrace_context(engine);
/*
* We need QUIESCE for resume handling, CLONE to check
* for CLONE_PTRACE, other events are always reported.
@@ -867,7 +867,7 @@ void ptrace_notify_stop(struct task_stru
return;
}
- context = ptrace_context(engine);
+ context = get_ptrace_context(engine);
if (WARN_ON(!ptrace_event_pending(context)))
return;
do_ptrace_notify_stop(context, tracee);
@@ -896,7 +896,7 @@ static void do_ptrace_resume(struct utra
enum utrace_resume_action action,
long request, long data)
{
- struct ptrace_context *context = ptrace_context(engine);
+ struct ptrace_context *context = get_ptrace_context(engine);
switch (get_stop_event(context)) {
case 0:
@@ -994,12 +994,14 @@ int ptrace_request(struct task_struct *c
long addr, long data)
{
struct utrace_engine *engine = ptrace_lookup_engine(child);
+ struct ptrace_context *context;
siginfo_t siginfo;
int ret;
if (unlikely(IS_ERR(engine)))
return -ESRCH;
+ context = get_ptrace_context(engine);
switch (request) {
case PTRACE_PEEKTEXT:
case PTRACE_PEEKDATA:
@@ -1017,13 +1019,12 @@ int ptrace_request(struct task_struct *c
ret = ptrace_set_options(engine, child, data);
break;
case PTRACE_GETEVENTMSG:
- ret = put_user(ptrace_context(engine)->eventmsg,
+ ret = put_user(context->eventmsg,
(unsigned long __user *) data);
break;
case PTRACE_GETSIGINFO:
- ret = ptrace_rw_siginfo(child, ptrace_context(engine),
- &siginfo, false);
+ ret = ptrace_rw_siginfo(child, context, &siginfo, false);
if (!ret)
ret = copy_siginfo_to_user((siginfo_t __user *) data,
&siginfo);
@@ -1034,7 +1035,7 @@ int ptrace_request(struct task_struct *c
sizeof siginfo))
ret = -EFAULT;
else
- ret = ptrace_rw_siginfo(child, ptrace_context(engine),
+ ret = ptrace_rw_siginfo(child, context,
&siginfo, true);
break;
@@ -1163,6 +1164,7 @@ int compat_ptrace_request(struct task_st
compat_ulong_t addr, compat_ulong_t data)
{
struct utrace_engine *engine = ptrace_lookup_engine(child);
+ struct ptrace_context *context;
compat_ulong_t __user *datap = compat_ptr(data);
compat_ulong_t word;
siginfo_t siginfo;
@@ -1171,6 +1173,7 @@ int compat_ptrace_request(struct task_st
if (unlikely(IS_ERR(engine)))
return -ESRCH;
+ context = get_ptrace_context(engine);
switch (request) {
case PTRACE_PEEKTEXT:
case PTRACE_PEEKDATA:
@@ -1188,12 +1191,11 @@ int compat_ptrace_request(struct task_st
break;
case PTRACE_GETEVENTMSG:
- ret = put_user((compat_ulong_t)ptrace_context(engine)->eventmsg,
- datap);
+ ret = put_user((compat_ulong_t)context->eventmsg, datap);
break;
case PTRACE_GETSIGINFO:
- ret = ptrace_rw_siginfo(child, ptrace_context(engine),
+ ret = ptrace_rw_siginfo(child, context,
&siginfo, false);
if (!ret)
ret = copy_siginfo_to_user32(
@@ -1207,7 +1209,7 @@ int compat_ptrace_request(struct task_st
&siginfo, (struct compat_siginfo __user *) datap))
ret = -EFAULT;
else
- ret = ptrace_rw_siginfo(child, ptrace_context(engine),
+ ret = ptrace_rw_siginfo(child, context,
&siginfo, true);
break;
