Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

[firefly-linux-kernel-4.4.55.git] / include / linux / lsm_audit.h

diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
index 6907251d52003c64434d33d1c4f9f691e6fb1419..112a55033352bbaaf79e045f9367edd3f45f5b1e 100644 (file)
--- a/include/linux/lsm_audit.h
+++ b/include/linux/lsm_audit.h
@@ -90,9 +90,41 @@ struct common_audit_data {
                        u32 requested;
                        u32 audited;
                        u32 denied;
+                       /*
+                        * auditdeny is a bit tricky and unintuitive.  See the
+                        * comments in avc.c for it's meaning and usage.
+                        */
+                       u32 auditdeny;
                        struct av_decision *avd;
                        int result;
                } selinux_audit_data;
+#endif
+#ifdef CONFIG_SECURITY_APPARMOR
+               struct {
+                       int error;
+                       int op;
+                       int type;
+                       void *profile;
+                       const char *name;
+                       const char *info;
+                       union {
+                               void *target;
+                               struct {
+                                       long pos;
+                                       void *target;
+                               } iface;
+                               struct {
+                                       int rlim;
+                                       unsigned long max;
+                               } rlim;
+                               struct {
+                                       const char *target;
+                                       u32 request;
+                                       u32 denied;
+                                       uid_t ouid;
+                               } fs;
+                       };
+               } apparmor_audit_data;
 #endif
        };
        /* these callback will be implemented by a specific LSM */