Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'apparmor-pr-2017-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
Pull apparmor bugfix from John Johansen:
"Fix oops in audit_signal_cb hook marked for stable"
* tag 'apparmor-pr-2017-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
apparmor: fix oops in audit_signal_cb hook
+7
-5
+7
-5
security/apparmor/include/audit.h
+7
-5
security/apparmor/include/audit.h
···
121
121
/* these entries require a custom callback fn */
122
122
struct {
123
123
struct aa_label *peer;
124
-
struct {
125
-
const char *target;
126
-
kuid_t ouid;
127
-
} fs;
124
+
union {
125
+
struct {
126
+
const char *target;
127
+
kuid_t ouid;
128
+
} fs;
129
+
int signal;
130
+
};
128
131
};
129
132
struct {
130
133
struct aa_profile *profile;
131
134
const char *ns;
132
135
long pos;
133
136
} iface;
134
-
int signal;
135
137
struct {
136
138
int rlim;
137
139
unsigned long max;