apparmor: move context.h to cred.h

Now that file contexts have been moved into file, and task context
fns() and data have been split from the context, only the cred context
remains in context.h so rename to cred.h to better reflect what it
deals with.

Signed-off-by: John Johansen <john.johansen@canonical.com>

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 00fc4f9f7f14a7f8e78c72c32fe86a5373303e02..874c1bf6b84ac1b3a2754fe7f221b3ba5f6a207c 100644 (file)
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -30,7 +30,7 @@
 #include "include/apparmor.h"
 #include "include/apparmorfs.h"
 #include "include/audit.h"
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/crypto.h"
 #include "include/ipc.h"
 #include "include/label.h"

diff --git a/security/apparmor/capability.c b/security/apparmor/capability.c
index 67e347192a557f3d97b0ecb4f56873aa0a20b37b..253ef6e9d445355c0f1d3379d319a8e052541032 100644 (file)
--- a/security/apparmor/capability.c
+++ b/security/apparmor/capability.c
@@ -19,7 +19,7 @@
 
 #include "include/apparmor.h"
 #include "include/capability.h"
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/policy.h"
 #include "include/audit.h"
 

diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index 56d080a6d7742d986f3ea7abbf770311f27ee0f2..cd58eef4eb8d23ce765161d0132bcf39e3aa2eb7 100644 (file)
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@ -22,7 +22,7 @@
 
 #include "include/audit.h"
 #include "include/apparmorfs.h"
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/domain.h"
 #include "include/file.h"
 #include "include/ipc.h"

diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index e79bf44396a36f60dde2e17fc68f2d0ac7d914b9..9a67a33904b3978038f23b02e892624448a3f1e0 100644 (file)
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -18,7 +18,7 @@
 
 #include "include/apparmor.h"
 #include "include/audit.h"
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/file.h"
 #include "include/match.h"
 #include "include/path.h"

diff --git a/security/apparmor/include/context.h b/security/apparmor/include/context.h
deleted file mode 100644 (file)
index e287b7d..0000000
--- a/security/apparmor/include/context.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * AppArmor security module
- *
- * This file contains AppArmor contexts used to associate "labels" to objects.
- *
- * Copyright (C) 1998-2008 Novell/SUSE
- * Copyright 2009-2010 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, version 2 of the
- * License.
- */
-
-#ifndef __AA_CONTEXT_H
-#define __AA_CONTEXT_H
-
-#include <linux/cred.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-
-#include "label.h"
-#include "policy_ns.h"
-#include "task.h"
-
-#define cred_label(X) ((X)->security)
-
-
-/**
- * aa_cred_raw_label - obtain cred's label
- * @cred: cred to obtain label from  (NOT NULL)
- *
- * Returns: confining label
- *
- * does NOT increment reference count
- */
-static inline struct aa_label *aa_cred_raw_label(const struct cred *cred)
-{
-       struct aa_label *label = cred_label(cred);
-
-       AA_BUG(!label);
-       return label;
-}
-
-/**
- * aa_get_newest_cred_label - obtain the newest label on a cred
- * @cred: cred to obtain label from (NOT NULL)
- *
- * Returns: newest version of confining label
- */
-static inline struct aa_label *aa_get_newest_cred_label(const struct cred *cred)
-{
-       return aa_get_newest_label(aa_cred_raw_label(cred));
-}
-
-/**
- * __aa_task_raw_label - retrieve another task's label
- * @task: task to query  (NOT NULL)
- *
- * Returns: @task's label without incrementing its ref count
- *
- * If @task != current needs to be called in RCU safe critical section
- */
-static inline struct aa_label *__aa_task_raw_label(struct task_struct *task)
-{
-       return aa_cred_raw_label(__task_cred(task));
-}
-
-/**
- * aa_current_raw_label - find the current tasks confining label
- *
- * Returns: up to date confining label or the ns unconfined label (NOT NULL)
- *
- * This fn will not update the tasks cred to the most up to date version
- * of the label so it is safe to call when inside of locks.
- */
-static inline struct aa_label *aa_current_raw_label(void)
-{
-       return aa_cred_raw_label(current_cred());
-}
-
-/**
- * aa_get_current_label - get the newest version of the current tasks label
- *
- * Returns: newest version of confining label (NOT NULL)
- *
- * This fn will not update the tasks cred, so it is safe inside of locks
- *
- * The returned reference must be put with aa_put_label()
- */
-static inline struct aa_label *aa_get_current_label(void)
-{
-       struct aa_label *l = aa_current_raw_label();
-
-       if (label_is_stale(l))
-               return aa_get_newest_label(l);
-       return aa_get_label(l);
-}
-
-#define __end_current_label_crit_section(X) end_current_label_crit_section(X)
-
-/**
- * end_label_crit_section - put a reference found with begin_current_label..
- * @label: label reference to put
- *
- * Should only be used with a reference obtained with
- * begin_current_label_crit_section and never used in situations where the
- * task cred may be updated
- */
-static inline void end_current_label_crit_section(struct aa_label *label)
-{
-       if (label != aa_current_raw_label())
-               aa_put_label(label);
-}
-
-/**
- * __begin_current_label_crit_section - current's confining label
- *
- * Returns: up to date confining label or the ns unconfined label (NOT NULL)
- *
- * safe to call inside locks
- *
- * The returned reference must be put with __end_current_label_crit_section()
- * This must NOT be used if the task cred could be updated within the
- * critical section between __begin_current_label_crit_section() ..
- * __end_current_label_crit_section()
- */
-static inline struct aa_label *__begin_current_label_crit_section(void)
-{
-       struct aa_label *label = aa_current_raw_label();
-
-       if (label_is_stale(label))
-               label = aa_get_newest_label(label);
-
-       return label;
-}
-
-/**
- * begin_current_label_crit_section - current's confining label and update it
- *
- * Returns: up to date confining label or the ns unconfined label (NOT NULL)
- *
- * Not safe to call inside locks
- *
- * The returned reference must be put with end_current_label_crit_section()
- * This must NOT be used if the task cred could be updated within the
- * critical section between begin_current_label_crit_section() ..
- * end_current_label_crit_section()
- */
-static inline struct aa_label *begin_current_label_crit_section(void)
-{
-       struct aa_label *label = aa_current_raw_label();
-
-       if (label_is_stale(label)) {
-               label = aa_get_newest_label(label);
-               if (aa_replace_current_label(label) == 0)
-                       /* task cred will keep the reference */
-                       aa_put_label(label);
-       }
-
-       return label;
-}
-
-static inline struct aa_ns *aa_get_current_ns(void)
-{
-       struct aa_label *label;
-       struct aa_ns *ns;
-
-       label  = __begin_current_label_crit_section();
-       ns = aa_get_ns(labels_ns(label));
-       __end_current_label_crit_section(label);
-
-       return ns;
-}
-
-#endif /* __AA_CONTEXT_H */

diff --git a/security/apparmor/include/cred.h b/security/apparmor/include/cred.h
new file mode 100644 (file)
index 0000000..e287b7d
--- /dev/null
+++ b/security/apparmor/include/cred.h
@@ -0,0 +1,176 @@
+/*
+ * AppArmor security module
+ *
+ * This file contains AppArmor contexts used to associate "labels" to objects.
+ *
+ * Copyright (C) 1998-2008 Novell/SUSE
+ * Copyright 2009-2010 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2 of the
+ * License.
+ */
+
+#ifndef __AA_CONTEXT_H
+#define __AA_CONTEXT_H
+
+#include <linux/cred.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+
+#include "label.h"
+#include "policy_ns.h"
+#include "task.h"
+
+#define cred_label(X) ((X)->security)
+
+
+/**
+ * aa_cred_raw_label - obtain cred's label
+ * @cred: cred to obtain label from  (NOT NULL)
+ *
+ * Returns: confining label
+ *
+ * does NOT increment reference count
+ */
+static inline struct aa_label *aa_cred_raw_label(const struct cred *cred)
+{
+       struct aa_label *label = cred_label(cred);
+
+       AA_BUG(!label);
+       return label;
+}
+
+/**
+ * aa_get_newest_cred_label - obtain the newest label on a cred
+ * @cred: cred to obtain label from (NOT NULL)
+ *
+ * Returns: newest version of confining label
+ */
+static inline struct aa_label *aa_get_newest_cred_label(const struct cred *cred)
+{
+       return aa_get_newest_label(aa_cred_raw_label(cred));
+}
+
+/**
+ * __aa_task_raw_label - retrieve another task's label
+ * @task: task to query  (NOT NULL)
+ *
+ * Returns: @task's label without incrementing its ref count
+ *
+ * If @task != current needs to be called in RCU safe critical section
+ */
+static inline struct aa_label *__aa_task_raw_label(struct task_struct *task)
+{
+       return aa_cred_raw_label(__task_cred(task));
+}
+
+/**
+ * aa_current_raw_label - find the current tasks confining label
+ *
+ * Returns: up to date confining label or the ns unconfined label (NOT NULL)
+ *
+ * This fn will not update the tasks cred to the most up to date version
+ * of the label so it is safe to call when inside of locks.
+ */
+static inline struct aa_label *aa_current_raw_label(void)
+{
+       return aa_cred_raw_label(current_cred());
+}
+
+/**
+ * aa_get_current_label - get the newest version of the current tasks label
+ *
+ * Returns: newest version of confining label (NOT NULL)
+ *
+ * This fn will not update the tasks cred, so it is safe inside of locks
+ *
+ * The returned reference must be put with aa_put_label()
+ */
+static inline struct aa_label *aa_get_current_label(void)
+{
+       struct aa_label *l = aa_current_raw_label();
+
+       if (label_is_stale(l))
+               return aa_get_newest_label(l);
+       return aa_get_label(l);
+}
+
+#define __end_current_label_crit_section(X) end_current_label_crit_section(X)
+
+/**
+ * end_label_crit_section - put a reference found with begin_current_label..
+ * @label: label reference to put
+ *
+ * Should only be used with a reference obtained with
+ * begin_current_label_crit_section and never used in situations where the
+ * task cred may be updated
+ */
+static inline void end_current_label_crit_section(struct aa_label *label)
+{
+       if (label != aa_current_raw_label())
+               aa_put_label(label);
+}
+
+/**
+ * __begin_current_label_crit_section - current's confining label
+ *
+ * Returns: up to date confining label or the ns unconfined label (NOT NULL)
+ *
+ * safe to call inside locks
+ *
+ * The returned reference must be put with __end_current_label_crit_section()
+ * This must NOT be used if the task cred could be updated within the
+ * critical section between __begin_current_label_crit_section() ..
+ * __end_current_label_crit_section()
+ */
+static inline struct aa_label *__begin_current_label_crit_section(void)
+{
+       struct aa_label *label = aa_current_raw_label();
+
+       if (label_is_stale(label))
+               label = aa_get_newest_label(label);
+
+       return label;
+}
+
+/**
+ * begin_current_label_crit_section - current's confining label and update it
+ *
+ * Returns: up to date confining label or the ns unconfined label (NOT NULL)
+ *
+ * Not safe to call inside locks
+ *
+ * The returned reference must be put with end_current_label_crit_section()
+ * This must NOT be used if the task cred could be updated within the
+ * critical section between begin_current_label_crit_section() ..
+ * end_current_label_crit_section()
+ */
+static inline struct aa_label *begin_current_label_crit_section(void)
+{
+       struct aa_label *label = aa_current_raw_label();
+
+       if (label_is_stale(label)) {
+               label = aa_get_newest_label(label);
+               if (aa_replace_current_label(label) == 0)
+                       /* task cred will keep the reference */
+                       aa_put_label(label);
+       }
+
+       return label;
+}
+
+static inline struct aa_ns *aa_get_current_ns(void)
+{
+       struct aa_label *label;
+       struct aa_ns *ns;
+
+       label  = __begin_current_label_crit_section();
+       ns = aa_get_ns(labels_ns(label));
+       __end_current_label_crit_section(label);
+
+       return ns;
+}
+
+#endif /* __AA_CONTEXT_H */

diff --git a/security/apparmor/ipc.c b/security/apparmor/ipc.c
index d7b137d4eb740a52404d67cb702b183fb63ddafe..527ea1557120ece44aa0c04d901bfa3e8d9b9422 100644 (file)
--- a/security/apparmor/ipc.c
+++ b/security/apparmor/ipc.c
@@ -17,7 +17,7 @@
 
 #include "include/audit.h"
 #include "include/capability.h"
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/policy.h"
 #include "include/ipc.h"
 #include "include/sig_names.h"

diff --git a/security/apparmor/label.c b/security/apparmor/label.c
index 69c7451beceff634ce8d8f6c40aba62e1f530c9f..523250e348378d1ef7ddcd80f7e6e64285ef787b 100644 (file)
--- a/security/apparmor/label.c
+++ b/security/apparmor/label.c
@@ -16,7 +16,7 @@
 #include <linux/sort.h>
 
 #include "include/apparmor.h"
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/label.h"
 #include "include/policy.h"
 #include "include/secid.h"

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 7577cd982230c02eb2a8ab263bdd954b3ce2837a..ef6334e11597fe2fff338ca47ca08b4c2934bb84 100644 (file)
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -30,7 +30,7 @@
 #include "include/apparmorfs.h"
 #include "include/audit.h"
 #include "include/capability.h"
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/file.h"
 #include "include/ipc.h"
 #include "include/path.h"

diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
index 8c558cbce930b15a69a7451973a974152fbb6a08..6e8c7ac0b33d1e7b678db852dcce3eb183a51ca8 100644 (file)
--- a/security/apparmor/mount.c
+++ b/security/apparmor/mount.c
@@ -18,7 +18,7 @@
 
 #include "include/apparmor.h"
 #include "include/audit.h"
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/domain.h"
 #include "include/file.h"
 #include "include/match.h"

diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index a158af1f1b38f6da7395cf53582ca28e30b0f2a1..a8e096a88e625174df25ba6d7b048b1c76d2aa19 100644 (file)
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -82,7 +82,7 @@
 
 #include "include/apparmor.h"
 #include "include/capability.h"
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/file.h"
 #include "include/ipc.h"
 #include "include/match.h"

diff --git a/security/apparmor/policy_ns.c b/security/apparmor/policy_ns.c
index b1e629cba70b76f7b586ea07bfa0b77725c73e1d..b0f9dc3f765a9d7a19003ae2f3bd327b58df98a9 100644 (file)
--- a/security/apparmor/policy_ns.c
+++ b/security/apparmor/policy_ns.c
@@ -21,7 +21,7 @@
 #include <linux/string.h>
 
 #include "include/apparmor.h"
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/policy_ns.h"
 #include "include/label.h"
 #include "include/policy.h"

diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index ece0c246cfe6d25a8387a0ecc6e8302097b0d0a1..40c8dc617b13abb9ae6c1c35a41c2d039e8bb4fd 100644 (file)
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c
@@ -23,7 +23,7 @@
 
 #include "include/apparmor.h"
 #include "include/audit.h"
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/crypto.h"
 #include "include/match.h"
 #include "include/path.h"

diff --git a/security/apparmor/procattr.c b/security/apparmor/procattr.c
index d81617379d63d94d69d82a6949e11c7b74ef7180..80c34ed373c382582d93e4cbb7693a5487993b7b 100644 (file)
--- a/security/apparmor/procattr.c
+++ b/security/apparmor/procattr.c
@@ -13,7 +13,7 @@
  */
 
 #include "include/apparmor.h"
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/policy.h"
 #include "include/policy_ns.h"
 #include "include/domain.h"

diff --git a/security/apparmor/resource.c b/security/apparmor/resource.c
index cf4d234febe94c9e96a8c0dc7df4d0132f856621..d022137143b9eb2eb0a846ed00bfbc860e388a3b 100644 (file)
--- a/security/apparmor/resource.c
+++ b/security/apparmor/resource.c
@@ -16,7 +16,7 @@
 #include <linux/security.h>
 
 #include "include/audit.h"
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/resource.h"
 #include "include/policy.h"
 

diff --git a/security/apparmor/task.c b/security/apparmor/task.c
index 36eb8707ad89368c64da7a3342ce358bdb4c4f97..44b9b938e06d482025ad6289335f7c3f52496357 100644 (file)
--- a/security/apparmor/task.c
+++ b/security/apparmor/task.c
@@ -16,7 +16,7 @@
  * should return to the previous cred if it has not been modified.
  */
 
-#include "include/context.h"
+#include "include/cred.h"
 #include "include/task.h"
 
 /**