1 From ba3f778a2ef31454032c2ca9c99d9212feb4dcf1 Mon Sep 17 00:00:00 2001
2 From: John Johansen <john.johansen@canonical.com>
3 Date: Tue, 18 Jul 2017 23:41:13 -0700
4 Subject: [PATCH 11/17] apparmor: add more debug asserts to apparmorfs
6 Signed-off-by: John Johansen <john.johansen@canonical.com>
7 Acked-by: Seth Arnold <seth.arnold@canonical.com>
8 (cherry picked from commit 52c9542126fb04df1f12c605b6c22719c9096794)
10 security/apparmor/apparmorfs.c | 17 +++++++++++++++++
11 1 file changed, 17 insertions(+)
13 diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
14 index 8fa6c898c44b..7acea14c850b 100644
15 --- a/security/apparmor/apparmorfs.c
16 +++ b/security/apparmor/apparmorfs.c
17 @@ -1446,6 +1446,10 @@ void __aafs_profile_migrate_dents(struct aa_profile *old,
23 + AA_BUG(!mutex_is_locked(&profiles_ns(old)->lock));
25 for (i = 0; i < AAFS_PROF_SIZEOF; i++) {
26 new->dents[i] = old->dents[i];
28 @@ -1509,6 +1513,9 @@ int __aafs_profile_mkdir(struct aa_profile *profile, struct dentry *parent)
29 struct dentry *dent = NULL, *dir;
33 + AA_BUG(!mutex_is_locked(&profiles_ns(profile)->lock));
37 p = aa_deref_parent(profile);
38 @@ -1734,6 +1741,7 @@ void __aafs_ns_rmdir(struct aa_ns *ns)
42 + AA_BUG(!mutex_is_locked(&ns->lock));
44 list_for_each_entry(child, &ns->base.profiles, base.list)
45 __aafs_profile_rmdir(child);
46 @@ -1906,6 +1914,10 @@ static struct aa_ns *__next_ns(struct aa_ns *root, struct aa_ns *ns)
48 struct aa_ns *parent, *next;
52 + AA_BUG(ns != root && !mutex_is_locked(&ns->parent->lock));
54 /* is next namespace a child */
55 if (!list_empty(&ns->sub_ns)) {
56 next = list_first_entry(&ns->sub_ns, typeof(*ns), base.list);
57 @@ -1940,6 +1952,9 @@ static struct aa_ns *__next_ns(struct aa_ns *root, struct aa_ns *ns)
58 static struct aa_profile *__first_profile(struct aa_ns *root,
62 + AA_BUG(ns && !mutex_is_locked(&ns->lock));
64 for (; ns; ns = __next_ns(root, ns)) {
65 if (!list_empty(&ns->base.profiles))
66 return list_first_entry(&ns->base.profiles,
67 @@ -1962,6 +1977,8 @@ static struct aa_profile *__next_profile(struct aa_profile *p)
68 struct aa_profile *parent;
69 struct aa_ns *ns = p->ns;
71 + AA_BUG(!mutex_is_locked(&profiles_ns(p)->lock));
73 /* is next profile a child */
74 if (!list_empty(&p->base.profiles))
75 return list_first_entry(&p->base.profiles, typeof(*p),