2 files changed, 2 insertions, 0 deletions

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 3f80a684c232..fefee040bf79 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -356,6 +356,7 @@ static void aafs_remove(struct dentry *dentry)
                         simple_rmdir(dir, dentry);
                 else
                         simple_unlink(dir, dentry);
+                d_delete(dentry);
                 dput(dentry);
         }
         inode_unlock(dir);
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index 379682e2a8d5..f6c2bcb2ab14 100644
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c
@@ -579,6 +579,7 @@ fail:
                         kfree(profile->secmark[i].label);
                 kfree(profile->secmark);
                 profile->secmark_count = 0;
+                profile->secmark = NULL;
         }
 
         e->pos = pos;