summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-30 18:56:41 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-30 18:56:41 -0500
commitdf8ba95c572a187ed2aa7403e97a7a7f58c01f00 (patch)
treed84f8538a98bcfcf549ccf581ff281e84cd8f7e1 /security
parent42062b988270ae2f55f2a563861f6ba3d980e9b8 (diff)
parentb12cbb21586277f72533769832c24cc6c1d60ab3 (diff)
downloadlinux-df8ba95c572a187ed2aa7403e97a7a7f58c01f00.tar.gz
linux-df8ba95c572a187ed2aa7403e97a7a7f58c01f00.tar.bz2
linux-df8ba95c572a187ed2aa7403e97a7a7f58c01f00.zip
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
Diffstat (limited to 'security')
-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 620e81169659..4ac095118717 100644
--- a/security/apparmor/include/audit.h
+++ b/security/apparmor/include/audit.h
@@ -121,17 +121,19 @@ 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 {
struct aa_profile *profile;
const char *ns;
long pos;
} iface;
- int signal;
struct {
int rlim;
unsigned long max;