From 8fe909dee3e530a7fa7ccf585d5d140942bd4990 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Mon, 7 Feb 2011 13:36:16 +0000 Subject: [PATCH] --- yaml --- r: 232949 b: refs/heads/master c: fb2b2a1d37f80cc818fd4487b510f4e11816e5e1 h: refs/heads/master i: 232947: ec15fe1dd0078b834984daf34fa93facdb50d65c v: v3 --- [refs] | 2 +- trunk/kernel/cred.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2df181e62e9a..80681ecb0906 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2edeaa34a6e3f2c43b667f6c4f7b27944b811695 +refs/heads/master: fb2b2a1d37f80cc818fd4487b510f4e11816e5e1 diff --git a/trunk/kernel/cred.c b/trunk/kernel/cred.c index fcf104bb5aa9..3a9d6dd53a6c 100644 --- a/trunk/kernel/cred.c +++ b/trunk/kernel/cred.c @@ -657,6 +657,8 @@ struct cred *prepare_kernel_cred(struct task_struct *daemon) validate_creds(old); *new = *old; + atomic_set(&new->usage, 1); + set_cred_subscribers(new, 0); get_uid(new->user); get_group_info(new->group_info); @@ -674,8 +676,6 @@ struct cred *prepare_kernel_cred(struct task_struct *daemon) if (security_prepare_creds(new, old, GFP_KERNEL) < 0) goto error; - atomic_set(&new->usage, 1); - set_cred_subscribers(new, 0); put_cred(old); validate_creds(new); return new;