From 5372bc3d6467f9c9f9e77d31a1be0599fa396c18 Mon Sep 17 00:00:00 2001 From: John Johansen Date: Sat, 10 Mar 2012 11:25:30 -0800 Subject: [PATCH] --- yaml --- r: 292299 b: refs/heads/master c: b1b4bc2ed94d157f3ed60c17a12b658ccb96a76f h: refs/heads/master i: 292297: 3e1ad2e2ee9791cb9d4552b3b3365f4ea2e40e3d 292295: 09d444f04355eab35a237c9b5da65b90f007b169 v: v3 --- [refs] | 2 +- trunk/security/apparmor/policy_unpack.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ecef6669fc73..b342f53a98cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef9a762279c9ce98c592fb144b31898411feb94d +refs/heads/master: b1b4bc2ed94d157f3ed60c17a12b658ccb96a76f diff --git a/trunk/security/apparmor/policy_unpack.c b/trunk/security/apparmor/policy_unpack.c index 5c46acf5aa65..c50634b724b5 100644 --- a/trunk/security/apparmor/policy_unpack.c +++ b/trunk/security/apparmor/policy_unpack.c @@ -84,7 +84,7 @@ static void audit_cb(struct audit_buffer *ab, void *va) * @new: profile if it has been allocated (MAYBE NULL) * @name: name of the profile being manipulated (MAYBE NULL) * @info: any extra info about the failure (MAYBE NULL) - * @e: buffer position info (NOT NULL) + * @e: buffer position info * @error: error code * * Returns: %0 or error @@ -95,7 +95,8 @@ static int audit_iface(struct aa_profile *new, const char *name, struct aa_profile *profile = __aa_current_profile(); struct common_audit_data sa; COMMON_AUDIT_DATA_INIT(&sa, NONE); - sa.aad.iface.pos = e->pos - e->start; + if (e) + sa.aad.iface.pos = e->pos - e->start; sa.aad.iface.target = new; sa.aad.name = name; sa.aad.info = info;