diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-28 21:30:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-28 21:30:34 -0800 |
| commit | 267ebfd662f32df647e0803ca5d2a26e7d7cc060 (patch) | |
| tree | e6b8e4e05219645e13ab2af4fba0ff85f40cf850 /kernel/fork.c | |
| parent | 9179a307bffc558ccd8cff8334ca08ef2b68ea1b (diff) | |
| parent | efdddf70cc1946feb4b00b1771cce3aef8efcc0e (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5
into kroah.com:/home/greg/linux/BK/lsm-2.5
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 2f5f00301182..65c8bd025f40 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -682,8 +682,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, if ((clone_flags & CLONE_DETACHED) && !(clone_flags & CLONE_THREAD)) return ERR_PTR(-EINVAL); - retval = security_ops->task_create(clone_flags); - if (retval) + if ((retval = security_task_create(clone_flags))) goto fork_out; retval = -ENOMEM; @@ -772,7 +771,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, INIT_LIST_HEAD(&p->local_pages); retval = -ENOMEM; - if (security_ops->task_alloc_security(p)) + if (security_task_alloc(p)) goto bad_fork_cleanup; /* copy all the process information */ if (copy_semundo(clone_flags, p)) @@ -930,7 +929,7 @@ bad_fork_cleanup_files: bad_fork_cleanup_semundo: exit_semundo(p); bad_fork_cleanup_security: - security_ops->task_free_security(p); + security_task_free(p); bad_fork_cleanup: if (p->pid > 0) free_pidmap(p->pid); |