From 0b656d6beca1214e35dfe815dee478761ad0e296 Mon Sep 17 00:00:00 2001 From: John Johansen Date: Thu, 16 Feb 2012 07:06:41 -0800 Subject: [PATCH] --- yaml --- r: 292289 b: refs/heads/master c: cdbd2884df8ad026143bb482a96d38e616947b17 h: refs/heads/master i: 292287: a9cc0ae647f0d597d42df6e51493db671f869890 v: v3 --- [refs] | 2 +- trunk/security/apparmor/policy_unpack.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 84ebe4ec61b6..488c90bc4cc3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d384b0a1a35f87f0ad70c29518f98f922b1c15cb +refs/heads/master: cdbd2884df8ad026143bb482a96d38e616947b17 diff --git a/trunk/security/apparmor/policy_unpack.c b/trunk/security/apparmor/policy_unpack.c index 741dd13e089b..5c46acf5aa65 100644 --- a/trunk/security/apparmor/policy_unpack.c +++ b/trunk/security/apparmor/policy_unpack.c @@ -554,6 +554,8 @@ static struct aa_profile *unpack_profile(struct aa_ext *e) goto fail; if (!unpack_u32(e, &(profile->caps.extended.cap[1]), NULL)) goto fail; + if (!unpack_nameX(e, AA_STRUCTEND, NULL)) + goto fail; } if (!unpack_rlimits(e, profile))