* [PATCH] APPARMOR: code cleanup on context.h
@ 2010-11-13 2:34 wzt.wzt
2010-11-15 23:29 ` wzt wzt
0 siblings, 1 reply; 4+ messages in thread
From: wzt.wzt @ 2010-11-13 2:34 UTC (permalink / raw)
To: linux-kernel; +Cc: john.johansen, apparmor, linux-security-module
Use current api to replace old codes.
Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com>
---
security/apparmor/include/context.h | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/security/apparmor/include/context.h b/security/apparmor/include/context.h
index a9cbee4..c9112f3 100644
--- a/security/apparmor/include/context.h
+++ b/security/apparmor/include/context.h
@@ -82,23 +82,6 @@ int aa_set_current_hat(struct aa_profile *profile, u64 token);
int aa_restore_previous_profile(u64 cookie);
/**
- * __aa_task_is_confined - determine if @task has any confinement
- * @task: task to check confinement of (NOT NULL)
- *
- * If @task != current needs to be called in RCU safe critical section
- */
-static inline bool __aa_task_is_confined(struct task_struct *task)
-{
- struct aa_task_cxt *cxt = __task_cred(task)->security;
-
- BUG_ON(!cxt || !cxt->profile);
- if (unconfined(aa_newest_version(cxt->profile)))
- return 0;
-
- return 1;
-}
-
-/**
* aa_cred_profile - obtain cred's profiles
* @cred: cred to obtain profiles from (NOT NULL)
*
@@ -138,9 +121,8 @@ static inline struct aa_profile *aa_current_profile(void)
{
const struct aa_task_cxt *cxt = current_cred()->security;
struct aa_profile *profile;
- BUG_ON(!cxt || !cxt->profile);
- profile = aa_newest_version(cxt->profile);
+ profile = __aa_current_profile();
/*
* Whether or not replacement succeeds, use newest profile so
* there is no need to update it after replacement.
@@ -151,4 +133,18 @@ static inline struct aa_profile *aa_current_profile(void)
return profile;
}
+/**
+ * __aa_task_is_confined - determine if @task has any confinement
+ * @task: task to check confinement of (NOT NULL)
+ *
+ * If @task != current needs to be called in RCU safe critical section
+ */
+static inline bool __aa_task_is_confined(struct task_struct *task)
+{
+ if (unconfined(aa_cred_profile(__task_cred(task))))
+ return 0;
+
+ return 1;
+}
+
#endif /* __AA_CONTEXT_H */
--
1.6.5.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] APPARMOR: code cleanup on context.h
2010-11-13 2:34 [PATCH] APPARMOR: code cleanup on context.h wzt.wzt
@ 2010-11-15 23:29 ` wzt wzt
2010-11-16 0:25 ` John Johansen
0 siblings, 1 reply; 4+ messages in thread
From: wzt wzt @ 2010-11-15 23:29 UTC (permalink / raw)
To: john.johansen; +Cc: linux-kernel, apparmor, linux-security-module
hi, john, any comments?
On Sat, Nov 13, 2010 at 10:34 AM, <wzt.wzt@gmail.com> wrote:
> Use current api to replace old codes.
>
> Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com>
>
> ---
> security/apparmor/include/context.h | 34 +++++++++++++++-------------------
> 1 files changed, 15 insertions(+), 19 deletions(-)
>
> diff --git a/security/apparmor/include/context.h b/security/apparmor/include/context.h
> index a9cbee4..c9112f3 100644
> --- a/security/apparmor/include/context.h
> +++ b/security/apparmor/include/context.h
> @@ -82,23 +82,6 @@ int aa_set_current_hat(struct aa_profile *profile, u64 token);
> int aa_restore_previous_profile(u64 cookie);
>
> /**
> - * __aa_task_is_confined - determine if @task has any confinement
> - * @task: task to check confinement of (NOT NULL)
> - *
> - * If @task != current needs to be called in RCU safe critical section
> - */
> -static inline bool __aa_task_is_confined(struct task_struct *task)
> -{
> - struct aa_task_cxt *cxt = __task_cred(task)->security;
> -
> - BUG_ON(!cxt || !cxt->profile);
> - if (unconfined(aa_newest_version(cxt->profile)))
> - return 0;
> -
> - return 1;
> -}
> -
> -/**
> * aa_cred_profile - obtain cred's profiles
> * @cred: cred to obtain profiles from (NOT NULL)
> *
> @@ -138,9 +121,8 @@ static inline struct aa_profile *aa_current_profile(void)
> {
> const struct aa_task_cxt *cxt = current_cred()->security;
> struct aa_profile *profile;
> - BUG_ON(!cxt || !cxt->profile);
>
> - profile = aa_newest_version(cxt->profile);
> + profile = __aa_current_profile();
> /*
> * Whether or not replacement succeeds, use newest profile so
> * there is no need to update it after replacement.
> @@ -151,4 +133,18 @@ static inline struct aa_profile *aa_current_profile(void)
> return profile;
> }
>
> +/**
> + * __aa_task_is_confined - determine if @task has any confinement
> + * @task: task to check confinement of (NOT NULL)
> + *
> + * If @task != current needs to be called in RCU safe critical section
> + */
> +static inline bool __aa_task_is_confined(struct task_struct *task)
> +{
> + if (unconfined(aa_cred_profile(__task_cred(task))))
> + return 0;
> +
> + return 1;
> +}
> +
> #endif /* __AA_CONTEXT_H */
> --
> 1.6.5.3
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] APPARMOR: code cleanup on context.h
2010-11-15 23:29 ` wzt wzt
@ 2010-11-16 0:25 ` John Johansen
2010-11-16 6:38 ` wzt wzt
0 siblings, 1 reply; 4+ messages in thread
From: John Johansen @ 2010-11-16 0:25 UTC (permalink / raw)
To: wzt wzt; +Cc: linux-kernel, apparmor, linux-security-module
On 11/15/2010 03:29 PM, wzt wzt wrote:
> hi, john, any comments?
>
Hi, yes sorry I am just trying to dig my self out from under a 4 day weekend :)
ACK, I am going to add it to the apparmor tree tonight once I finish cleaning the
tree up and push, and it will be included in the next pull request to security.
thanks
john
> On Sat, Nov 13, 2010 at 10:34 AM, <wzt.wzt@gmail.com> wrote:
>> Use current api to replace old codes.
>>
>> Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com>
>>
>> ---
>> security/apparmor/include/context.h | 34 +++++++++++++++-------------------
>> 1 files changed, 15 insertions(+), 19 deletions(-)
>>
>> diff --git a/security/apparmor/include/context.h b/security/apparmor/include/context.h
>> index a9cbee4..c9112f3 100644
>> --- a/security/apparmor/include/context.h
>> +++ b/security/apparmor/include/context.h
>> @@ -82,23 +82,6 @@ int aa_set_current_hat(struct aa_profile *profile, u64 token);
>> int aa_restore_previous_profile(u64 cookie);
>>
>> /**
>> - * __aa_task_is_confined - determine if @task has any confinement
>> - * @task: task to check confinement of (NOT NULL)
>> - *
>> - * If @task != current needs to be called in RCU safe critical section
>> - */
>> -static inline bool __aa_task_is_confined(struct task_struct *task)
>> -{
>> - struct aa_task_cxt *cxt = __task_cred(task)->security;
>> -
>> - BUG_ON(!cxt || !cxt->profile);
>> - if (unconfined(aa_newest_version(cxt->profile)))
>> - return 0;
>> -
>> - return 1;
>> -}
>> -
>> -/**
>> * aa_cred_profile - obtain cred's profiles
>> * @cred: cred to obtain profiles from (NOT NULL)
>> *
>> @@ -138,9 +121,8 @@ static inline struct aa_profile *aa_current_profile(void)
>> {
>> const struct aa_task_cxt *cxt = current_cred()->security;
>> struct aa_profile *profile;
>> - BUG_ON(!cxt || !cxt->profile);
>>
>> - profile = aa_newest_version(cxt->profile);
>> + profile = __aa_current_profile();
>> /*
>> * Whether or not replacement succeeds, use newest profile so
>> * there is no need to update it after replacement.
>> @@ -151,4 +133,18 @@ static inline struct aa_profile *aa_current_profile(void)
>> return profile;
>> }
>>
>> +/**
>> + * __aa_task_is_confined - determine if @task has any confinement
>> + * @task: task to check confinement of (NOT NULL)
>> + *
>> + * If @task != current needs to be called in RCU safe critical section
>> + */
>> +static inline bool __aa_task_is_confined(struct task_struct *task)
>> +{
>> + if (unconfined(aa_cred_profile(__task_cred(task))))
>> + return 0;
>> +
>> + return 1;
>> +}
>> +
>> #endif /* __AA_CONTEXT_H */
>> --
>> 1.6.5.3
>>
>>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] APPARMOR: code cleanup on context.h
2010-11-16 0:25 ` John Johansen
@ 2010-11-16 6:38 ` wzt wzt
0 siblings, 0 replies; 4+ messages in thread
From: wzt wzt @ 2010-11-16 6:38 UTC (permalink / raw)
To: John Johansen; +Cc: linux-kernel, apparmor, linux-security-module
OK, thank you.
> Hi, yes sorry I am just trying to dig my self out from under a 4 day weekend :)
>
> ACK, I am going to add it to the apparmor tree tonight once I finish cleaning the
> tree up and push, and it will be included in the next pull request to security.
>
> thanks
> john
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-11-16 6:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-13 2:34 [PATCH] APPARMOR: code cleanup on context.h wzt.wzt
2010-11-15 23:29 ` wzt wzt
2010-11-16 0:25 ` John Johansen
2010-11-16 6:38 ` wzt wzt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).