Commit b5beb07a authored by John Johansen's avatar John Johansen

apparmor: fix resource audit messages when auditing peer

Resource auditing is using the peer field which is not available
when the rlim data struct is used, because it is a different element
of the same union. Accessing peer during resource auditing could
cause garbage log entries or even oops the kernel.

Move the rlim data block into the same struct as the peer field
so they can be used together.

CC: <stable@vger.kernel.org>
Fixes: 86b92cb7 ("apparmor: move resource checks to using labels")
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent 040d9e2b
...@@ -126,6 +126,10 @@ struct apparmor_audit_data { ...@@ -126,6 +126,10 @@ struct apparmor_audit_data {
const char *target; const char *target;
kuid_t ouid; kuid_t ouid;
} fs; } fs;
struct {
int rlim;
unsigned long max;
} rlim;
int signal; int signal;
}; };
}; };
...@@ -134,10 +138,6 @@ struct apparmor_audit_data { ...@@ -134,10 +138,6 @@ struct apparmor_audit_data {
const char *ns; const char *ns;
long pos; long pos;
} iface; } iface;
struct {
int rlim;
unsigned long max;
} rlim;
struct { struct {
const char *src_name; const char *src_name;
const char *type; const char *type;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment