diff options
| author | James Morris <jmorris@namei.org> | 2010-05-18 00:57:00 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-18 00:57:00 +0200 |
| commit | 539c99fd7fc28f8db257c713c10fb4aceadf8887 (patch) | |
| tree | e603e48ac816cde56e4872e0f7bcdfe7bd33f3b3 /kernel/cred.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee... (diff) | |
| parent | KEYS: Return more accurate error codes (diff) | |
| download | linux-539c99fd7fc28f8db257c713c10fb4aceadf8887.tar.xz linux-539c99fd7fc28f8db257c713c10fb4aceadf8887.zip | |
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) #endif BUG_ON(atomic_read(&new->usage) < 1); - security_commit_creds(new, old); - get_cred(new); /* we will require a ref for the subj creds too */ /* dumpability changes */ |