Skip to contentSkip to conversation

APPARMOR: code cleanup on context.h

PATCH In review [email protected] 2 participants 4 messages Nov 13, 2010 – Nov 16, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 APPARMOR: code cleanup on context.h

Use current api to replace old codes.

---
 security/apparmor/include/context.h |   34 +++++++++++++++-------------------
 1 files changed, 15 insertions(+), 19 deletions(-)
security/apparmor/include/context.h +15 -19
index a9cbee4..c9112f3 100644
@@ -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 */
Signature · 1 line
1.6.5.3
author
#1 lore raw

hi, john, any comments?

Quoted 70 lines · On Sat, Nov 13, 2010 at 10:34 AM, <[email protected]> wrote:

Use current api to replace old codes.

---
 security/apparmor/include/context.h |   34 +++++++++++++++-------------------

 1 files changed, 15 insertions(+), 19 deletions(-)
security/apparmor/include/context.h +15 -20
index a9cbee4..c9112f3 100644
@@ -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

maintainer
#2 lore raw
Quoted 2 lines · wzt wzt

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

Quoted 71 lines · On Sat, Nov 13, 2010 at 10:34 AM, <[email protected]> wrote:
Quoted 70 lines

Use current api to replace old codes.

---
 security/apparmor/include/context.h |   34 +++++++++++++++-------------------
 1 files changed, 15 insertions(+), 19 deletions(-)
security/apparmor/include/context.h +15 -20
index a9cbee4..c9112f3 100644
@@ -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

author
#3 lore raw

OK, thank you.

Quoted 8 lines

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