Commit df8ba95c authored Nov 30, 2017 by Linus Torvalds

Merge tag 'apparmor-pr-2017-11-30' of...

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

parents 42062b98 b12cbb21

security/apparmor/include/audit.h

+7 −5

Original line number	Diff line number	Diff line
		@@ -121,17 +121,19 @@ struct apparmor_audit_data {
		/* these entries require a custom callback fn */
		struct {
		struct aa_label *peer;
		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;