[apparmor] [PATCH] apparmor: make include headers self-contained

[Ryan Lee]

Besides of resolving clangd IDE warnings, self-contained headers will be
less likely to break if the surrounding includes in .c files using them
change.

Signed-off-by: Ryan Lee <ryan.lee at canonical.com>
---
 security/apparmor/include/apparmorfs.h    | 3 +++
 security/apparmor/include/audit.h         | 3 ++-
 security/apparmor/include/capability.h    | 1 +
 security/apparmor/include/ipc.h           | 2 ++
 security/apparmor/include/path.h          | 3 +++
 security/apparmor/include/perms.h         | 1 +
 security/apparmor/include/policy_unpack.h | 1 +
 security/apparmor/include/procattr.h      | 2 ++
 security/apparmor/include/resource.h      | 1 +
 security/apparmor/include/secid.h         | 1 +
 security/apparmor/include/task.h          | 5 +++++
 11 files changed, 22 insertions(+), 1 deletion(-)

This patch applies cleanly to the upstream kernel.

diff --git a/security/apparmor/include/apparmorfs.h b/security/apparmor/include/apparmorfs.h
index dd580594dfb7..e8f8c0953364 100644
--- a/security/apparmor/include/apparmorfs.h
+++ b/security/apparmor/include/apparmorfs.h
@@ -11,6 +11,9 @@
 #ifndef __AA_APPARMORFS_H
 #define __AA_APPARMORFS_H
 
+#include <linux/init.h>
+#include <linux/types.h>
+
 extern struct path aa_null;
 
 enum aa_sfs_type {
diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h
index 1a71a94ea19c..851fd2821a6c 100644
--- a/security/apparmor/include/audit.h
+++ b/security/apparmor/include/audit.h
@@ -17,9 +17,10 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 
-#include "file.h"
 #include "label.h"
 
+struct aa_profile;
+
 extern const char *const audit_mode_names[];
 #define AUDIT_MAX_INDEX 5
 enum audit_mode {
diff --git a/security/apparmor/include/capability.h b/security/apparmor/include/capability.h
index 1ddcec2d1160..3fb8b8f2182a 100644
--- a/security/apparmor/include/capability.h
+++ b/security/apparmor/include/capability.h
@@ -11,6 +11,7 @@
 #ifndef __AA_CAPABILITY_H
 #define __AA_CAPABILITY_H
 
+#include <linux/capability.h>
 #include <linux/sched.h>
 
 #include "apparmorfs.h"
diff --git a/security/apparmor/include/ipc.h b/security/apparmor/include/ipc.h
index 323dd071afe9..98dc0b6c05a7 100644
--- a/security/apparmor/include/ipc.h
+++ b/security/apparmor/include/ipc.h
@@ -13,6 +13,8 @@
 
 #include <linux/sched.h>
 
+#include "label.h"
+
 #define SIGUNKNOWN 0
 #define MAXMAPPED_SIG 35
 
diff --git a/security/apparmor/include/path.h b/security/apparmor/include/path.h
index 8bb915d48dc7..250812a77e11 100644
--- a/security/apparmor/include/path.h
+++ b/security/apparmor/include/path.h
@@ -11,6 +11,9 @@
 #ifndef __AA_PATH_H
 #define __AA_PATH_H
 
+#include <linux/path.h>
+#include <linux/types.h>
+
 enum path_flags {
 	PATH_IS_DIR = 0x1,		/* path is a directory */
 	PATH_SOCK_COND = 0x2,
diff --git a/security/apparmor/include/perms.h b/security/apparmor/include/perms.h
index 37a3781b99a0..3a472c11c4b1 100644
--- a/security/apparmor/include/perms.h
+++ b/security/apparmor/include/perms.h
@@ -11,6 +11,7 @@
 #define __AA_PERM_H
 
 #include <linux/fs.h>
+#include "audit.h"
 #include "label.h"
 
 #define AA_MAY_EXEC		MAY_EXEC
diff --git a/security/apparmor/include/policy_unpack.h b/security/apparmor/include/policy_unpack.h
index a6f4611ee50c..c65a83682737 100644
--- a/security/apparmor/include/policy_unpack.h
+++ b/security/apparmor/include/policy_unpack.h
@@ -16,6 +16,7 @@
 #include <linux/dcache.h>
 #include <linux/workqueue.h>
 
+#include "lib.h"
 
 struct aa_load_ent {
 	struct list_head list;
diff --git a/security/apparmor/include/procattr.h b/security/apparmor/include/procattr.h
index 03dbfdb2f2c0..56acd1bdb634 100644
--- a/security/apparmor/include/procattr.h
+++ b/security/apparmor/include/procattr.h
@@ -11,6 +11,8 @@
 #ifndef __AA_PROCATTR_H
 #define __AA_PROCATTR_H
 
+#include "label.h"
+
 int aa_getprocattr(struct aa_label *label, char **string, bool newline);
 int aa_setprocattr_changehat(char *args, size_t size, int flags);
 
diff --git a/security/apparmor/include/resource.h b/security/apparmor/include/resource.h
index ad2c0da8e64f..a3d1cd28b403 100644
--- a/security/apparmor/include/resource.h
+++ b/security/apparmor/include/resource.h
@@ -15,6 +15,7 @@
 #include <linux/sched.h>
 
 #include "apparmorfs.h"
+#include "label.h"
 
 struct aa_profile;
 
diff --git a/security/apparmor/include/secid.h b/security/apparmor/include/secid.h
index 6025d3849cf8..a0d458d7ffa4 100644
--- a/security/apparmor/include/secid.h
+++ b/security/apparmor/include/secid.h
@@ -10,6 +10,7 @@
 #ifndef __AA_SECID_H
 #define __AA_SECID_H
 
+#include <linux/security.h>
 #include <linux/slab.h>
 #include <linux/types.h>
 
diff --git a/security/apparmor/include/task.h b/security/apparmor/include/task.h
index b1aaaf60fa8b..017d8b06b8f2 100644
--- a/security/apparmor/include/task.h
+++ b/security/apparmor/include/task.h
@@ -10,6 +10,11 @@
 #ifndef __AA_TASK_H
 #define __AA_TASK_H
 
+#include <linux/sched.h>
+
+#include "audit.h"
+#include "label.h"
+
 static inline struct aa_task_ctx *task_ctx(struct task_struct *task)
 {
 	return task->security + apparmor_blob_sizes.lbs_task;
-- 
2.43.0