diff options
| author | Linus Torvalds <torvalds@linuxfoundation.org> | 2007-11-23 15:35:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linuxfoundation.org> | 2007-11-23 15:35:23 -0500 |
| commit | bdd9c8e5286db0c47362e34a29fa1343fa83a4a6 (patch) | |
| tree | 54317cb8991b4c47520c752e73da76a0ac5aa7cb /fs | |
| parent | 6e14d18e1c9ae7410b2df8733a4af2ac6db66d10 (diff) | |
| download | linux-bdd9c8e5286db0c47362e34a29fa1343fa83a4a6.tar.gz | |
Import 2.4.0-test2pre2
Notice: this object is not reachable from any branch.
Notice: this object is not reachable from any branch.
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/binfmt_aout.c | 2 | ||||
| -rw-r--r-- | fs/binfmt_elf.c | 2 | ||||
| -rw-r--r-- | fs/exec.c | 2 | ||||
| -rw-r--r-- | fs/proc/base.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c index ef4af4dfefda4b..ade9091a54059f 100644 --- a/fs/binfmt_aout.c +++ b/fs/binfmt_aout.c @@ -406,7 +406,7 @@ beyond_if: regs->gp = ex.a_gpvalue; #endif start_thread(regs, ex.a_entry, current->mm->start_stack); - if (current->flags & PF_PTRACED) + if (current->ptrace & PT_PTRACED) send_sig(SIGTRAP, current, 0); return 0; } diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 39279c752d0735..9f005062541b3f 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -747,7 +747,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs) #endif start_thread(regs, elf_entry, bprm->p); - if (current->flags & PF_PTRACED) + if (current->ptrace & PT_PTRACED) send_sig(SIGTRAP, current, 0); retval = 0; out: diff --git a/fs/exec.c b/fs/exec.c index 6811398438e1b7..a1401b4cc24641 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -528,7 +528,7 @@ flush_failed: */ static inline int must_not_trace_exec(struct task_struct * p) { - return (p->flags & PF_PTRACED) && !cap_raised(p->p_pptr->cap_effective, CAP_SYS_PTRACE); + return (p->ptrace & PT_PTRACED) && !cap_raised(p->p_pptr->cap_effective, CAP_SYS_PTRACE); } /* diff --git a/fs/proc/base.c b/fs/proc/base.c index d513987d828b3e..ecb8a29919d545 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -285,7 +285,7 @@ static struct file_operations proc_info_file_operations = { }; #define MAY_PTRACE(p) \ -(p==current||(p->p_pptr==current&&(p->flags&PF_PTRACED)&&p->state==TASK_STOPPED)) +(p==current||(p->p_pptr==current&&(p->ptrace & PT_PTRACED)&&p->state==TASK_STOPPED)) static ssize_t mem_read(struct file * file, char * buf, size_t count, loff_t *ppos) |