From 233a8a7761e258165b3c21fd3f54ae77f768fb94 Mon Sep 17 00:00:00 2001 From: "Serge E. Hallyn" Date: Mon, 1 Jun 2009 22:47:19 -0500 Subject: [PATCH] --- yaml --- r: 146442 b: refs/heads/master c: fbeb4a9c20d00e2550156f9e5a34473fbde59de2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/tomoyo/tomoyo.h | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index c8e4703781ed..f76a7b7151df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13b297d943828c4594527a2bd9c30ecd04e37886 +refs/heads/master: fbeb4a9c20d00e2550156f9e5a34473fbde59de2 diff --git a/trunk/security/tomoyo/tomoyo.h b/trunk/security/tomoyo/tomoyo.h index 41c6ebafb9c5..f12d5ada7dcb 100644 --- a/trunk/security/tomoyo/tomoyo.h +++ b/trunk/security/tomoyo/tomoyo.h @@ -90,17 +90,10 @@ static inline struct tomoyo_domain_info *tomoyo_domain(void) return current_cred()->security; } -/* Caller holds tasklist_lock spinlock. */ static inline struct tomoyo_domain_info *tomoyo_real_domain(struct task_struct *task) { - /***** CRITICAL SECTION START *****/ - const struct cred *cred = get_task_cred(task); - struct tomoyo_domain_info *domain = cred->security; - - put_cred(cred); - return domain; - /***** CRITICAL SECTION END *****/ + return task_cred_xxx(task, security); } #endif /* !defined(_SECURITY_TOMOYO_TOMOYO_H) */