Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-12-01 16:21:43 +0100
committerJiri Kosina <jkosina@suse.cz>2017-12-01 16:21:43 +0100
commitbb053bcaf0bb8a57cea3000100bd114252764da9 (patch)
treec0f37266a9b42cf6ad08acde3fa63d936fce3245
parent6fe9d2fdc91da0c18f3df1612eba7d8cf0796273 (diff)
parent9b020fd958f3f955fcd4c8922283f9735b63b49c (diff)
Merge remote-tracking branch 'origin/users/rgoldwyn/SLE15/for-next' into SLE15
-rw-r--r--security/apparmor/include/audit.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h
index ac3666ff7892..3788b0c3a5c4 100644
--- a/security/apparmor/include/audit.h
+++ b/security/apparmor/include/audit.h
@@ -121,10 +121,13 @@ struct apparmor_audit_data {
/* these entries require a custom callback fn */
struct {
struct aa_label *peer;
- struct {
- const char *target;
- kuid_t ouid;
- } fs;
+ union {
+ struct {
+ const char *target;
+ kuid_t ouid;
+ } fs;
+ int signal;
+ };
struct {
int type, protocol;
struct sock *sk;
@@ -135,7 +138,6 @@ struct apparmor_audit_data {
const char *ns;
long pos;
} iface;
- int signal;
struct {
int rlim;
unsigned long max;