diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-27 07:07:19 (GMT) |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-22 19:57:56 (GMT) |
| commit | 67d1214551e800f9fe7dc7c47a346d2df0fafed5 (patch) | |
| tree | ffcc93af9390339adda36668255e617073b724a1 /security/keys/process_keys.c | |
| parent | 158e1645e07f3e9f7e4962d7a0997f5c3b98311b (diff) | |
| download | linux-67d1214551e800f9fe7dc7c47a346d2df0fafed5.tar.xz | |
merge task_work and rcu_head, get rid of separate allocation for keyring case
task_work and rcu_head are identical now; merge them (calling the result
struct callback_head, rcu_head #define'd to it), kill separate allocation
in security/keys since we can just use cred->rcu now.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/keys/process_keys.c')
| -rw-r--r-- | security/keys/process_keys.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index c9b07c9..54339cf 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c @@ -834,13 +834,11 @@ error: * Replace a process's session keyring on behalf of one of its children when * the target process is about to resume userspace execution. */ -void key_change_session_keyring(struct task_work *twork) +void key_change_session_keyring(struct callback_head *twork) { const struct cred *old = current_cred(); - struct kludge *p = container_of(twork, struct kludge, twork); - struct cred *new = p->cred; + struct cred *new = container_of(twork, struct cred, rcu); - kfree(p); if (unlikely(current->flags & PF_EXITING)) { put_cred(new); return; |