LSM: split LSM_AUDIT_DATA_FS into _PATH and _INODE

The lsm common audit code has wacky contortions making sure which pieces
of information are set based on if it was given a path, dentry, or
inode.  Split this into path and inode to get rid of some of the code
complexity.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
index 112a55033352..bbaceab83a65 100644
--- a/include/linux/lsm_audit.h
+++ b/include/linux/lsm_audit.h
@@ -27,7 +27,7 @@
 /* Auxiliary data to use in generating the audit record. */
 struct common_audit_data {
         char type;
-#define LSM_AUDIT_DATA_FS       1
+#define LSM_AUDIT_DATA_PATH     1
 #define LSM_AUDIT_DATA_NET      2
 #define LSM_AUDIT_DATA_CAP      3
 #define LSM_AUDIT_DATA_IPC      4
@@ -35,12 +35,11 @@ struct common_audit_data {
 #define LSM_AUDIT_DATA_KEY      6
 #define LSM_AUDIT_DATA_NONE     7
 #define LSM_AUDIT_DATA_KMOD     8
+#define LSM_AUDIT_DATA_INODE    9
         struct task_struct *tsk;
         union   {
-                struct {
-                        struct path path;
-                        struct inode *inode;
-                } fs;
+                struct path path;
+                struct inode *inode;
                 struct {
                         int netif;
                         struct sock *sk;