diff options
| author | James Morris <jmorris@namei.org> | 2010-05-17 18:57:00 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-17 18:57:00 -0400 |
| commit | 539c99fd7fc28f8db257c713c10fb4aceadf8887 (patch) | |
| tree | e603e48ac816cde56e4872e0f7bcdfe7bd33f3b3 /kernel/cred.c | |
| parent | ba2e1c5f25a99dec3873745031ad23ce3fd79bff (diff) | |
| parent | 4d09ec0f705cf88a12add029c058b53f288cfaa2 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'kernel/cred.c')
| -rw-r--r-- | kernel/cred.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/cred.c b/kernel/cred.c index 62af1816c235..31f38a99adf7 100644 --- a/kernel/cred.c +++ b/kernel/cred.c | |||
| @@ -523,8 +523,6 @@ int commit_creds(struct cred *new) | |||
| 523 | #endif | 523 | #endif |
| 524 | BUG_ON(atomic_read(&new->usage) < 1); | 524 | BUG_ON(atomic_read(&new->usage) < 1); |
| 525 | 525 | ||
| 526 | security_commit_creds(new, old); | ||
| 527 | |||
| 528 | get_cred(new); /* we will require a ref for the subj creds too */ | 526 | get_cred(new); /* we will require a ref for the subj creds too */ |
| 529 | 527 | ||
| 530 | /* dumpability changes */ | 528 | /* dumpability changes */ |