Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5cb3e91ebd0405519795f243adbfc4ed2a6fe53f

Authored by John Johansen
Committed by James Morris
1 parent 34ec4de42b
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

apparmor: fix memleak of the profile hash 

BugLink: http://bugs.launchpad.net/bugs/1235523

This fixes the following kmemleak trace:
unreferenced object 0xffff8801e8c35680 (size 32):
  comm "apparmor_parser", pid 691, jiffies 4294895667 (age 13230.876s)
  hex dump (first 32 bytes):
    e0 d3 4e b5 ac 6d f4 ed 3f cb ee 48 1c fd 40 cf  ..N..m..?..H..@.
    5b cc e9 93 00 00 00 00 00 00 00 00 00 00 00 00  [...............
  backtrace:
    [<ffffffff817a97ee>] kmemleak_alloc+0x4e/0xb0
    [<ffffffff811ca9f3>] __kmalloc+0x103/0x290
    [<ffffffff8138acbc>] aa_calc_profile_hash+0x6c/0x150
    [<ffffffff8138074d>] aa_unpack+0x39d/0xd50
    [<ffffffff8137eced>] aa_replace_profiles+0x3d/0xd80
    [<ffffffff81376937>] profile_replace+0x37/0x50
    [<ffffffff811e9f2d>] vfs_write+0xbd/0x1e0
    [<ffffffff811ea96c>] SyS_write+0x4c/0xa0
    [<ffffffff817ccb1d>] system_call_fastpath+0x1a/0x1f
    [<ffffffffffffffff>] 0xffffffffffffffff

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>

Showing 1 changed file with 1 additions and 0 deletions Inline Diff

security/apparmor/policy.c
Diff comments   View file @ 5cb3e91
1 /* 1 /*
2 * AppArmor security module 2 * AppArmor security module
3 * 3 *
4 * This file contains AppArmor policy manipulation functions 4 * This file contains AppArmor policy manipulation functions
5 * 5 *
6 * Copyright (C) 1998-2008 Novell/SUSE 6 * Copyright (C) 1998-2008 Novell/SUSE
7 * Copyright 2009-2010 Canonical Ltd. 7 * Copyright 2009-2010 Canonical Ltd.
8 * 8 *
9 * This program is free software; you can redistribute it and/or 9 * This program is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU General Public License as 10 * modify it under the terms of the GNU General Public License as
11 * published by the Free Software Foundation, version 2 of the 11 * published by the Free Software Foundation, version 2 of the
12 * License. 12 * License.
13 * 13 *
14 * 14 *
15 * AppArmor policy is based around profiles, which contain the rules a 15 * AppArmor policy is based around profiles, which contain the rules a
16 * task is confined by. Every task in the system has a profile attached 16 * task is confined by. Every task in the system has a profile attached
17 * to it determined either by matching "unconfined" tasks against the 17 * to it determined either by matching "unconfined" tasks against the
18 * visible set of profiles or by following a profiles attachment rules. 18 * visible set of profiles or by following a profiles attachment rules.
19 * 19 *
20 * Each profile exists in a profile namespace which is a container of 20 * Each profile exists in a profile namespace which is a container of
21 * visible profiles. Each namespace contains a special "unconfined" profile, 21 * visible profiles. Each namespace contains a special "unconfined" profile,
22 * which doesn't enforce any confinement on a task beyond DAC. 22 * which doesn't enforce any confinement on a task beyond DAC.
23 * 23 *
24 * Namespace and profile names can be written together in either 24 * Namespace and profile names can be written together in either
25 * of two syntaxes. 25 * of two syntaxes.
26 * :namespace:profile - used by kernel interfaces for easy detection 26 * :namespace:profile - used by kernel interfaces for easy detection
27 * namespace://profile - used by policy 27 * namespace://profile - used by policy
28 * 28 *
29 * Profile names can not start with : or @ or ^ and may not contain \0 29 * Profile names can not start with : or @ or ^ and may not contain \0
30 * 30 *
31 * Reserved profile names 31 * Reserved profile names
32 * unconfined - special automatically generated unconfined profile 32 * unconfined - special automatically generated unconfined profile
33 * inherit - special name to indicate profile inheritance 33 * inherit - special name to indicate profile inheritance
34 * null-XXXX-YYYY - special automatically generated learning profiles 34 * null-XXXX-YYYY - special automatically generated learning profiles
35 * 35 *
36 * Namespace names may not start with / or @ and may not contain \0 or : 36 * Namespace names may not start with / or @ and may not contain \0 or :
37 * Reserved namespace names 37 * Reserved namespace names
38 * user-XXXX - user defined profiles 38 * user-XXXX - user defined profiles
39 * 39 *
40 * a // in a profile or namespace name indicates a hierarchical name with the 40 * a // in a profile or namespace name indicates a hierarchical name with the
41 * name before the // being the parent and the name after the child. 41 * name before the // being the parent and the name after the child.
42 * 42 *
43 * Profile and namespace hierarchies serve two different but similar purposes. 43 * Profile and namespace hierarchies serve two different but similar purposes.
44 * The namespace contains the set of visible profiles that are considered 44 * The namespace contains the set of visible profiles that are considered
45 * for attachment. The hierarchy of namespaces allows for virtualizing 45 * for attachment. The hierarchy of namespaces allows for virtualizing
46 * the namespace so that for example a chroot can have its own set of profiles 46 * the namespace so that for example a chroot can have its own set of profiles
47 * which may define some local user namespaces. 47 * which may define some local user namespaces.
48 * The profile hierarchy severs two distinct purposes, 48 * The profile hierarchy severs two distinct purposes,
49 * - it allows for sub profiles or hats, which allows an application to run 49 * - it allows for sub profiles or hats, which allows an application to run
50 * subprograms under its own profile with different restriction than it 50 * subprograms under its own profile with different restriction than it
51 * self, and not have it use the system profile. 51 * self, and not have it use the system profile.
52 * eg. if a mail program starts an editor, the policy might make the 52 * eg. if a mail program starts an editor, the policy might make the
53 * restrictions tighter on the editor tighter than the mail program, 53 * restrictions tighter on the editor tighter than the mail program,
54 * and definitely different than general editor restrictions 54 * and definitely different than general editor restrictions
55 * - it allows for binary hierarchy of profiles, so that execution history 55 * - it allows for binary hierarchy of profiles, so that execution history
56 * is preserved. This feature isn't exploited by AppArmor reference policy 56 * is preserved. This feature isn't exploited by AppArmor reference policy
57 * but is allowed. NOTE: this is currently suboptimal because profile 57 * but is allowed. NOTE: this is currently suboptimal because profile
58 * aliasing is not currently implemented so that a profile for each 58 * aliasing is not currently implemented so that a profile for each
59 * level must be defined. 59 * level must be defined.
60 * eg. /bin/bash///bin/ls as a name would indicate /bin/ls was started 60 * eg. /bin/bash///bin/ls as a name would indicate /bin/ls was started
61 * from /bin/bash 61 * from /bin/bash
62 * 62 *
63 * A profile or namespace name that can contain one or more // separators 63 * A profile or namespace name that can contain one or more // separators
64 * is referred to as an hname (hierarchical). 64 * is referred to as an hname (hierarchical).
65 * eg. /bin/bash//bin/ls 65 * eg. /bin/bash//bin/ls
66 * 66 *
67 * An fqname is a name that may contain both namespace and profile hnames. 67 * An fqname is a name that may contain both namespace and profile hnames.
68 * eg. :ns:/bin/bash//bin/ls 68 * eg. :ns:/bin/bash//bin/ls
69 * 69 *
70 * NOTES: 70 * NOTES:
71 * - locking of profile lists is currently fairly coarse. All profile 71 * - locking of profile lists is currently fairly coarse. All profile
72 * lists within a namespace use the namespace lock. 72 * lists within a namespace use the namespace lock.
73 * FIXME: move profile lists to using rcu_lists 73 * FIXME: move profile lists to using rcu_lists
74 */ 74 */
75 75
76 #include <linux/slab.h> 76 #include <linux/slab.h>
77 #include <linux/spinlock.h> 77 #include <linux/spinlock.h>
78 #include <linux/string.h> 78 #include <linux/string.h>
79 79
80 #include "include/apparmor.h" 80 #include "include/apparmor.h"
81 #include "include/capability.h" 81 #include "include/capability.h"
82 #include "include/context.h" 82 #include "include/context.h"
83 #include "include/file.h" 83 #include "include/file.h"
84 #include "include/ipc.h" 84 #include "include/ipc.h"
85 #include "include/match.h" 85 #include "include/match.h"
86 #include "include/path.h" 86 #include "include/path.h"
87 #include "include/policy.h" 87 #include "include/policy.h"
88 #include "include/policy_unpack.h" 88 #include "include/policy_unpack.h"
89 #include "include/resource.h" 89 #include "include/resource.h"
90 90
91 91
92 /* root profile namespace */ 92 /* root profile namespace */
93 struct aa_namespace *root_ns; 93 struct aa_namespace *root_ns;
94 94
95 const char *const aa_profile_mode_names[] = { 95 const char *const aa_profile_mode_names[] = {
96 "enforce", 96 "enforce",
97 "complain", 97 "complain",
98 "kill", 98 "kill",
99 "unconfined", 99 "unconfined",
100 }; 100 };
101 101
102 /** 102 /**
103 * hname_tail - find the last component of an hname 103 * hname_tail - find the last component of an hname
104 * @name: hname to find the base profile name component of (NOT NULL) 104 * @name: hname to find the base profile name component of (NOT NULL)
105 * 105 *
106 * Returns: the tail (base profile name) name component of an hname 106 * Returns: the tail (base profile name) name component of an hname
107 */ 107 */
108 static const char *hname_tail(const char *hname) 108 static const char *hname_tail(const char *hname)
109 { 109 {
110 char *split; 110 char *split;
111 hname = strim((char *)hname); 111 hname = strim((char *)hname);
112 for (split = strstr(hname, "//"); split; split = strstr(hname, "//")) 112 for (split = strstr(hname, "//"); split; split = strstr(hname, "//"))
113 hname = split + 2; 113 hname = split + 2;
114 114
115 return hname; 115 return hname;
116 } 116 }
117 117
118 /** 118 /**
119 * policy_init - initialize a policy structure 119 * policy_init - initialize a policy structure
120 * @policy: policy to initialize (NOT NULL) 120 * @policy: policy to initialize (NOT NULL)
121 * @prefix: prefix name if any is required. (MAYBE NULL) 121 * @prefix: prefix name if any is required. (MAYBE NULL)
122 * @name: name of the policy, init will make a copy of it (NOT NULL) 122 * @name: name of the policy, init will make a copy of it (NOT NULL)
123 * 123 *
124 * Note: this fn creates a copy of strings passed in 124 * Note: this fn creates a copy of strings passed in
125 * 125 *
126 * Returns: true if policy init successful 126 * Returns: true if policy init successful
127 */ 127 */
128 static bool policy_init(struct aa_policy *policy, const char *prefix, 128 static bool policy_init(struct aa_policy *policy, const char *prefix,
129 const char *name) 129 const char *name)
130 { 130 {
131 /* freed by policy_free */ 131 /* freed by policy_free */
132 if (prefix) { 132 if (prefix) {
133 policy->hname = kmalloc(strlen(prefix) + strlen(name) + 3, 133 policy->hname = kmalloc(strlen(prefix) + strlen(name) + 3,
134 GFP_KERNEL); 134 GFP_KERNEL);
135 if (policy->hname) 135 if (policy->hname)
136 sprintf(policy->hname, "%s//%s", prefix, name); 136 sprintf(policy->hname, "%s//%s", prefix, name);
137 } else 137 } else
138 policy->hname = kstrdup(name, GFP_KERNEL); 138 policy->hname = kstrdup(name, GFP_KERNEL);
139 if (!policy->hname) 139 if (!policy->hname)
140 return 0; 140 return 0;
141 /* base.name is a substring of fqname */ 141 /* base.name is a substring of fqname */
142 policy->name = (char *)hname_tail(policy->hname); 142 policy->name = (char *)hname_tail(policy->hname);
143 INIT_LIST_HEAD(&policy->list); 143 INIT_LIST_HEAD(&policy->list);
144 INIT_LIST_HEAD(&policy->profiles); 144 INIT_LIST_HEAD(&policy->profiles);
145 145
146 return 1; 146 return 1;
147 } 147 }
148 148
149 /** 149 /**
150 * policy_destroy - free the elements referenced by @policy 150 * policy_destroy - free the elements referenced by @policy
151 * @policy: policy that is to have its elements freed (NOT NULL) 151 * @policy: policy that is to have its elements freed (NOT NULL)
152 */ 152 */
153 static void policy_destroy(struct aa_policy *policy) 153 static void policy_destroy(struct aa_policy *policy)
154 { 154 {
155 /* still contains profiles -- invalid */ 155 /* still contains profiles -- invalid */
156 if (on_list_rcu(&policy->profiles)) { 156 if (on_list_rcu(&policy->profiles)) {
157 AA_ERROR("%s: internal error, " 157 AA_ERROR("%s: internal error, "
158 "policy '%s' still contains profiles\n", 158 "policy '%s' still contains profiles\n",
159 __func__, policy->name); 159 __func__, policy->name);
160 BUG(); 160 BUG();
161 } 161 }
162 if (on_list_rcu(&policy->list)) { 162 if (on_list_rcu(&policy->list)) {
163 AA_ERROR("%s: internal error, policy '%s' still on list\n", 163 AA_ERROR("%s: internal error, policy '%s' still on list\n",
164 __func__, policy->name); 164 __func__, policy->name);
165 BUG(); 165 BUG();
166 } 166 }
167 167
168 /* don't free name as its a subset of hname */ 168 /* don't free name as its a subset of hname */
169 kzfree(policy->hname); 169 kzfree(policy->hname);
170 } 170 }
171 171
172 /** 172 /**
173 * __policy_find - find a policy by @name on a policy list 173 * __policy_find - find a policy by @name on a policy list
174 * @head: list to search (NOT NULL) 174 * @head: list to search (NOT NULL)
175 * @name: name to search for (NOT NULL) 175 * @name: name to search for (NOT NULL)
176 * 176 *
177 * Requires: rcu_read_lock be held 177 * Requires: rcu_read_lock be held
178 * 178 *
179 * Returns: unrefcounted policy that match @name or NULL if not found 179 * Returns: unrefcounted policy that match @name or NULL if not found
180 */ 180 */
181 static struct aa_policy *__policy_find(struct list_head *head, const char *name) 181 static struct aa_policy *__policy_find(struct list_head *head, const char *name)
182 { 182 {
183 struct aa_policy *policy; 183 struct aa_policy *policy;
184 184
185 list_for_each_entry_rcu(policy, head, list) { 185 list_for_each_entry_rcu(policy, head, list) {
186 if (!strcmp(policy->name, name)) 186 if (!strcmp(policy->name, name))
187 return policy; 187 return policy;
188 } 188 }
189 return NULL; 189 return NULL;
190 } 190 }
191 191
192 /** 192 /**
193 * __policy_strn_find - find a policy that's name matches @len chars of @str 193 * __policy_strn_find - find a policy that's name matches @len chars of @str
194 * @head: list to search (NOT NULL) 194 * @head: list to search (NOT NULL)
195 * @str: string to search for (NOT NULL) 195 * @str: string to search for (NOT NULL)
196 * @len: length of match required 196 * @len: length of match required
197 * 197 *
198 * Requires: rcu_read_lock be held 198 * Requires: rcu_read_lock be held
199 * 199 *
200 * Returns: unrefcounted policy that match @str or NULL if not found 200 * Returns: unrefcounted policy that match @str or NULL if not found
201 * 201 *
202 * if @len == strlen(@strlen) then this is equiv to __policy_find 202 * if @len == strlen(@strlen) then this is equiv to __policy_find
203 * other wise it allows searching for policy by a partial match of name 203 * other wise it allows searching for policy by a partial match of name
204 */ 204 */
205 static struct aa_policy *__policy_strn_find(struct list_head *head, 205 static struct aa_policy *__policy_strn_find(struct list_head *head,
206 const char *str, int len) 206 const char *str, int len)
207 { 207 {
208 struct aa_policy *policy; 208 struct aa_policy *policy;
209 209
210 list_for_each_entry_rcu(policy, head, list) { 210 list_for_each_entry_rcu(policy, head, list) {
211 if (aa_strneq(policy->name, str, len)) 211 if (aa_strneq(policy->name, str, len))
212 return policy; 212 return policy;
213 } 213 }
214 214
215 return NULL; 215 return NULL;
216 } 216 }
217 217
218 /* 218 /*
219 * Routines for AppArmor namespaces 219 * Routines for AppArmor namespaces
220 */ 220 */
221 221
222 static const char *hidden_ns_name = "---"; 222 static const char *hidden_ns_name = "---";
223 /** 223 /**
224 * aa_ns_visible - test if @view is visible from @curr 224 * aa_ns_visible - test if @view is visible from @curr
225 * @curr: namespace to treat as the parent (NOT NULL) 225 * @curr: namespace to treat as the parent (NOT NULL)
226 * @view: namespace to test if visible from @curr (NOT NULL) 226 * @view: namespace to test if visible from @curr (NOT NULL)
227 * 227 *
228 * Returns: true if @view is visible from @curr else false 228 * Returns: true if @view is visible from @curr else false
229 */ 229 */
230 bool aa_ns_visible(struct aa_namespace *curr, struct aa_namespace *view) 230 bool aa_ns_visible(struct aa_namespace *curr, struct aa_namespace *view)
231 { 231 {
232 if (curr == view) 232 if (curr == view)
233 return true; 233 return true;
234 234
235 for ( ; view; view = view->parent) { 235 for ( ; view; view = view->parent) {
236 if (view->parent == curr) 236 if (view->parent == curr)
237 return true; 237 return true;
238 } 238 }
239 return false; 239 return false;
240 } 240 }
241 241
242 /** 242 /**
243 * aa_na_name - Find the ns name to display for @view from @curr 243 * aa_na_name - Find the ns name to display for @view from @curr
244 * @curr - current namespace (NOT NULL) 244 * @curr - current namespace (NOT NULL)
245 * @view - namespace attempting to view (NOT NULL) 245 * @view - namespace attempting to view (NOT NULL)
246 * 246 *
247 * Returns: name of @view visible from @curr 247 * Returns: name of @view visible from @curr
248 */ 248 */
249 const char *aa_ns_name(struct aa_namespace *curr, struct aa_namespace *view) 249 const char *aa_ns_name(struct aa_namespace *curr, struct aa_namespace *view)
250 { 250 {
251 /* if view == curr then the namespace name isn't displayed */ 251 /* if view == curr then the namespace name isn't displayed */
252 if (curr == view) 252 if (curr == view)
253 return ""; 253 return "";
254 254
255 if (aa_ns_visible(curr, view)) { 255 if (aa_ns_visible(curr, view)) {
256 /* at this point if a ns is visible it is in a view ns 256 /* at this point if a ns is visible it is in a view ns
257 * thus the curr ns.hname is a prefix of its name. 257 * thus the curr ns.hname is a prefix of its name.
258 * Only output the virtualized portion of the name 258 * Only output the virtualized portion of the name
259 * Add + 2 to skip over // separating curr hname prefix 259 * Add + 2 to skip over // separating curr hname prefix
260 * from the visible tail of the views hname 260 * from the visible tail of the views hname
261 */ 261 */
262 return view->base.hname + strlen(curr->base.hname) + 2; 262 return view->base.hname + strlen(curr->base.hname) + 2;
263 } else 263 } else
264 return hidden_ns_name; 264 return hidden_ns_name;
265 } 265 }
266 266
267 /** 267 /**
268 * alloc_namespace - allocate, initialize and return a new namespace 268 * alloc_namespace - allocate, initialize and return a new namespace
269 * @prefix: parent namespace name (MAYBE NULL) 269 * @prefix: parent namespace name (MAYBE NULL)
270 * @name: a preallocated name (NOT NULL) 270 * @name: a preallocated name (NOT NULL)
271 * 271 *
272 * Returns: refcounted namespace or NULL on failure. 272 * Returns: refcounted namespace or NULL on failure.
273 */ 273 */
274 static struct aa_namespace *alloc_namespace(const char *prefix, 274 static struct aa_namespace *alloc_namespace(const char *prefix,
275 const char *name) 275 const char *name)
276 { 276 {
277 struct aa_namespace *ns; 277 struct aa_namespace *ns;
278 278
279 ns = kzalloc(sizeof(*ns), GFP_KERNEL); 279 ns = kzalloc(sizeof(*ns), GFP_KERNEL);
280 AA_DEBUG("%s(%p)\n", __func__, ns); 280 AA_DEBUG("%s(%p)\n", __func__, ns);
281 if (!ns) 281 if (!ns)
282 return NULL; 282 return NULL;
283 if (!policy_init(&ns->base, prefix, name)) 283 if (!policy_init(&ns->base, prefix, name))
284 goto fail_ns; 284 goto fail_ns;
285 285
286 INIT_LIST_HEAD(&ns->sub_ns); 286 INIT_LIST_HEAD(&ns->sub_ns);
287 mutex_init(&ns->lock); 287 mutex_init(&ns->lock);
288 288
289 /* released by free_namespace */ 289 /* released by free_namespace */
290 ns->unconfined = aa_alloc_profile("unconfined"); 290 ns->unconfined = aa_alloc_profile("unconfined");
291 if (!ns->unconfined) 291 if (!ns->unconfined)
292 goto fail_unconfined; 292 goto fail_unconfined;
293 293
294 ns->unconfined->flags = PFLAG_IX_ON_NAME_ERROR | 294 ns->unconfined->flags = PFLAG_IX_ON_NAME_ERROR |
295 PFLAG_IMMUTABLE | PFLAG_NS_COUNT; 295 PFLAG_IMMUTABLE | PFLAG_NS_COUNT;
296 ns->unconfined->mode = APPARMOR_UNCONFINED; 296 ns->unconfined->mode = APPARMOR_UNCONFINED;
297 297
298 /* ns and ns->unconfined share ns->unconfined refcount */ 298 /* ns and ns->unconfined share ns->unconfined refcount */
299 ns->unconfined->ns = ns; 299 ns->unconfined->ns = ns;
300 300
301 atomic_set(&ns->uniq_null, 0); 301 atomic_set(&ns->uniq_null, 0);
302 302
303 return ns; 303 return ns;
304 304
305 fail_unconfined: 305 fail_unconfined:
306 kzfree(ns->base.hname); 306 kzfree(ns->base.hname);
307 fail_ns: 307 fail_ns:
308 kzfree(ns); 308 kzfree(ns);
309 return NULL; 309 return NULL;
310 } 310 }
311 311
312 /** 312 /**
313 * free_namespace - free a profile namespace 313 * free_namespace - free a profile namespace
314 * @ns: the namespace to free (MAYBE NULL) 314 * @ns: the namespace to free (MAYBE NULL)
315 * 315 *
316 * Requires: All references to the namespace must have been put, if the 316 * Requires: All references to the namespace must have been put, if the
317 * namespace was referenced by a profile confining a task, 317 * namespace was referenced by a profile confining a task,
318 */ 318 */
319 static void free_namespace(struct aa_namespace *ns) 319 static void free_namespace(struct aa_namespace *ns)
320 { 320 {
321 if (!ns) 321 if (!ns)
322 return; 322 return;
323 323
324 policy_destroy(&ns->base); 324 policy_destroy(&ns->base);
325 aa_put_namespace(ns->parent); 325 aa_put_namespace(ns->parent);
326 326
327 ns->unconfined->ns = NULL; 327 ns->unconfined->ns = NULL;
328 aa_free_profile(ns->unconfined); 328 aa_free_profile(ns->unconfined);
329 kzfree(ns); 329 kzfree(ns);
330 } 330 }
331 331
332 /** 332 /**
333 * __aa_find_namespace - find a namespace on a list by @name 333 * __aa_find_namespace - find a namespace on a list by @name
334 * @head: list to search for namespace on (NOT NULL) 334 * @head: list to search for namespace on (NOT NULL)
335 * @name: name of namespace to look for (NOT NULL) 335 * @name: name of namespace to look for (NOT NULL)
336 * 336 *
337 * Returns: unrefcounted namespace 337 * Returns: unrefcounted namespace
338 * 338 *
339 * Requires: rcu_read_lock be held 339 * Requires: rcu_read_lock be held
340 */ 340 */
341 static struct aa_namespace *__aa_find_namespace(struct list_head *head, 341 static struct aa_namespace *__aa_find_namespace(struct list_head *head,
342 const char *name) 342 const char *name)
343 { 343 {
344 return (struct aa_namespace *)__policy_find(head, name); 344 return (struct aa_namespace *)__policy_find(head, name);
345 } 345 }
346 346
347 /** 347 /**
348 * aa_find_namespace - look up a profile namespace on the namespace list 348 * aa_find_namespace - look up a profile namespace on the namespace list
349 * @root: namespace to search in (NOT NULL) 349 * @root: namespace to search in (NOT NULL)
350 * @name: name of namespace to find (NOT NULL) 350 * @name: name of namespace to find (NOT NULL)
351 * 351 *
352 * Returns: a refcounted namespace on the list, or NULL if no namespace 352 * Returns: a refcounted namespace on the list, or NULL if no namespace
353 * called @name exists. 353 * called @name exists.
354 * 354 *
355 * refcount released by caller 355 * refcount released by caller
356 */ 356 */
357 struct aa_namespace *aa_find_namespace(struct aa_namespace *root, 357 struct aa_namespace *aa_find_namespace(struct aa_namespace *root,
358 const char *name) 358 const char *name)
359 { 359 {
360 struct aa_namespace *ns = NULL; 360 struct aa_namespace *ns = NULL;
361 361
362 rcu_read_lock(); 362 rcu_read_lock();
363 ns = aa_get_namespace(__aa_find_namespace(&root->sub_ns, name)); 363 ns = aa_get_namespace(__aa_find_namespace(&root->sub_ns, name));
364 rcu_read_unlock(); 364 rcu_read_unlock();
365 365
366 return ns; 366 return ns;
367 } 367 }
368 368
369 /** 369 /**
370 * aa_prepare_namespace - find an existing or create a new namespace of @name 370 * aa_prepare_namespace - find an existing or create a new namespace of @name
371 * @name: the namespace to find or add (MAYBE NULL) 371 * @name: the namespace to find or add (MAYBE NULL)
372 * 372 *
373 * Returns: refcounted namespace or NULL if failed to create one 373 * Returns: refcounted namespace or NULL if failed to create one
374 */ 374 */
375 static struct aa_namespace *aa_prepare_namespace(const char *name) 375 static struct aa_namespace *aa_prepare_namespace(const char *name)
376 { 376 {
377 struct aa_namespace *ns, *root; 377 struct aa_namespace *ns, *root;
378 378
379 root = aa_current_profile()->ns; 379 root = aa_current_profile()->ns;
380 380
381 mutex_lock(&root->lock); 381 mutex_lock(&root->lock);
382 382
383 /* if name isn't specified the profile is loaded to the current ns */ 383 /* if name isn't specified the profile is loaded to the current ns */
384 if (!name) { 384 if (!name) {
385 /* released by caller */ 385 /* released by caller */
386 ns = aa_get_namespace(root); 386 ns = aa_get_namespace(root);
387 goto out; 387 goto out;
388 } 388 }
389 389
390 /* try and find the specified ns and if it doesn't exist create it */ 390 /* try and find the specified ns and if it doesn't exist create it */
391 /* released by caller */ 391 /* released by caller */
392 ns = aa_get_namespace(__aa_find_namespace(&root->sub_ns, name)); 392 ns = aa_get_namespace(__aa_find_namespace(&root->sub_ns, name));
393 if (!ns) { 393 if (!ns) {
394 ns = alloc_namespace(root->base.hname, name); 394 ns = alloc_namespace(root->base.hname, name);
395 if (!ns) 395 if (!ns)
396 goto out; 396 goto out;
397 if (__aa_fs_namespace_mkdir(ns, ns_subns_dir(root), name)) { 397 if (__aa_fs_namespace_mkdir(ns, ns_subns_dir(root), name)) {
398 AA_ERROR("Failed to create interface for ns %s\n", 398 AA_ERROR("Failed to create interface for ns %s\n",
399 ns->base.name); 399 ns->base.name);
400 free_namespace(ns); 400 free_namespace(ns);
401 ns = NULL; 401 ns = NULL;
402 goto out; 402 goto out;
403 } 403 }
404 ns->parent = aa_get_namespace(root); 404 ns->parent = aa_get_namespace(root);
405 list_add_rcu(&ns->base.list, &root->sub_ns); 405 list_add_rcu(&ns->base.list, &root->sub_ns);
406 /* add list ref */ 406 /* add list ref */
407 aa_get_namespace(ns); 407 aa_get_namespace(ns);
408 } 408 }
409 out: 409 out:
410 mutex_unlock(&root->lock); 410 mutex_unlock(&root->lock);
411 411
412 /* return ref */ 412 /* return ref */
413 return ns; 413 return ns;
414 } 414 }
415 415
416 /** 416 /**
417 * __list_add_profile - add a profile to a list 417 * __list_add_profile - add a profile to a list
418 * @list: list to add it to (NOT NULL) 418 * @list: list to add it to (NOT NULL)
419 * @profile: the profile to add (NOT NULL) 419 * @profile: the profile to add (NOT NULL)
420 * 420 *
421 * refcount @profile, should be put by __list_remove_profile 421 * refcount @profile, should be put by __list_remove_profile
422 * 422 *
423 * Requires: namespace lock be held, or list not be shared 423 * Requires: namespace lock be held, or list not be shared
424 */ 424 */
425 static void __list_add_profile(struct list_head *list, 425 static void __list_add_profile(struct list_head *list,
426 struct aa_profile *profile) 426 struct aa_profile *profile)
427 { 427 {
428 list_add_rcu(&profile->base.list, list); 428 list_add_rcu(&profile->base.list, list);
429 /* get list reference */ 429 /* get list reference */
430 aa_get_profile(profile); 430 aa_get_profile(profile);
431 } 431 }
432 432
433 /** 433 /**
434 * __list_remove_profile - remove a profile from the list it is on 434 * __list_remove_profile - remove a profile from the list it is on
435 * @profile: the profile to remove (NOT NULL) 435 * @profile: the profile to remove (NOT NULL)
436 * 436 *
437 * remove a profile from the list, warning generally removal should 437 * remove a profile from the list, warning generally removal should
438 * be done with __replace_profile as most profile removals are 438 * be done with __replace_profile as most profile removals are
439 * replacements to the unconfined profile. 439 * replacements to the unconfined profile.
440 * 440 *
441 * put @profile list refcount 441 * put @profile list refcount
442 * 442 *
443 * Requires: namespace lock be held, or list not have been live 443 * Requires: namespace lock be held, or list not have been live
444 */ 444 */
445 static void __list_remove_profile(struct aa_profile *profile) 445 static void __list_remove_profile(struct aa_profile *profile)
446 { 446 {
447 list_del_rcu(&profile->base.list); 447 list_del_rcu(&profile->base.list);
448 aa_put_profile(profile); 448 aa_put_profile(profile);
449 } 449 }
450 450
451 static void __profile_list_release(struct list_head *head); 451 static void __profile_list_release(struct list_head *head);
452 452
453 /** 453 /**
454 * __remove_profile - remove old profile, and children 454 * __remove_profile - remove old profile, and children
455 * @profile: profile to be replaced (NOT NULL) 455 * @profile: profile to be replaced (NOT NULL)
456 * 456 *
457 * Requires: namespace list lock be held, or list not be shared 457 * Requires: namespace list lock be held, or list not be shared
458 */ 458 */
459 static void __remove_profile(struct aa_profile *profile) 459 static void __remove_profile(struct aa_profile *profile)
460 { 460 {
461 /* release any children lists first */ 461 /* release any children lists first */
462 __profile_list_release(&profile->base.profiles); 462 __profile_list_release(&profile->base.profiles);
463 /* released by free_profile */ 463 /* released by free_profile */
464 __aa_update_replacedby(profile, profile->ns->unconfined); 464 __aa_update_replacedby(profile, profile->ns->unconfined);
465 __aa_fs_profile_rmdir(profile); 465 __aa_fs_profile_rmdir(profile);
466 __list_remove_profile(profile); 466 __list_remove_profile(profile);
467 } 467 }
468 468
469 /** 469 /**
470 * __profile_list_release - remove all profiles on the list and put refs 470 * __profile_list_release - remove all profiles on the list and put refs
471 * @head: list of profiles (NOT NULL) 471 * @head: list of profiles (NOT NULL)
472 * 472 *
473 * Requires: namespace lock be held 473 * Requires: namespace lock be held
474 */ 474 */
475 static void __profile_list_release(struct list_head *head) 475 static void __profile_list_release(struct list_head *head)
476 { 476 {
477 struct aa_profile *profile, *tmp; 477 struct aa_profile *profile, *tmp;
478 list_for_each_entry_safe(profile, tmp, head, base.list) 478 list_for_each_entry_safe(profile, tmp, head, base.list)
479 __remove_profile(profile); 479 __remove_profile(profile);
480 } 480 }
481 481
482 static void __ns_list_release(struct list_head *head); 482 static void __ns_list_release(struct list_head *head);
483 483
484 /** 484 /**
485 * destroy_namespace - remove everything contained by @ns 485 * destroy_namespace - remove everything contained by @ns
486 * @ns: namespace to have it contents removed (NOT NULL) 486 * @ns: namespace to have it contents removed (NOT NULL)
487 */ 487 */
488 static void destroy_namespace(struct aa_namespace *ns) 488 static void destroy_namespace(struct aa_namespace *ns)
489 { 489 {
490 if (!ns) 490 if (!ns)
491 return; 491 return;
492 492
493 mutex_lock(&ns->lock); 493 mutex_lock(&ns->lock);
494 /* release all profiles in this namespace */ 494 /* release all profiles in this namespace */
495 __profile_list_release(&ns->base.profiles); 495 __profile_list_release(&ns->base.profiles);
496 496
497 /* release all sub namespaces */ 497 /* release all sub namespaces */
498 __ns_list_release(&ns->sub_ns); 498 __ns_list_release(&ns->sub_ns);
499 499
500 if (ns->parent) 500 if (ns->parent)
501 __aa_update_replacedby(ns->unconfined, ns->parent->unconfined); 501 __aa_update_replacedby(ns->unconfined, ns->parent->unconfined);
502 __aa_fs_namespace_rmdir(ns); 502 __aa_fs_namespace_rmdir(ns);
503 mutex_unlock(&ns->lock); 503 mutex_unlock(&ns->lock);
504 } 504 }
505 505
506 /** 506 /**
507 * __remove_namespace - remove a namespace and all its children 507 * __remove_namespace - remove a namespace and all its children
508 * @ns: namespace to be removed (NOT NULL) 508 * @ns: namespace to be removed (NOT NULL)
509 * 509 *
510 * Requires: ns->parent->lock be held and ns removed from parent. 510 * Requires: ns->parent->lock be held and ns removed from parent.
511 */ 511 */
512 static void __remove_namespace(struct aa_namespace *ns) 512 static void __remove_namespace(struct aa_namespace *ns)
513 { 513 {
514 /* remove ns from namespace list */ 514 /* remove ns from namespace list */
515 list_del_rcu(&ns->base.list); 515 list_del_rcu(&ns->base.list);
516 destroy_namespace(ns); 516 destroy_namespace(ns);
517 aa_put_namespace(ns); 517 aa_put_namespace(ns);
518 } 518 }
519 519
520 /** 520 /**
521 * __ns_list_release - remove all profile namespaces on the list put refs 521 * __ns_list_release - remove all profile namespaces on the list put refs
522 * @head: list of profile namespaces (NOT NULL) 522 * @head: list of profile namespaces (NOT NULL)
523 * 523 *
524 * Requires: namespace lock be held 524 * Requires: namespace lock be held
525 */ 525 */
526 static void __ns_list_release(struct list_head *head) 526 static void __ns_list_release(struct list_head *head)
527 { 527 {
528 struct aa_namespace *ns, *tmp; 528 struct aa_namespace *ns, *tmp;
529 list_for_each_entry_safe(ns, tmp, head, base.list) 529 list_for_each_entry_safe(ns, tmp, head, base.list)
530 __remove_namespace(ns); 530 __remove_namespace(ns);
531 531
532 } 532 }
533 533
534 /** 534 /**
535 * aa_alloc_root_ns - allocate the root profile namespace 535 * aa_alloc_root_ns - allocate the root profile namespace
536 * 536 *
537 * Returns: %0 on success else error 537 * Returns: %0 on success else error
538 * 538 *
539 */ 539 */
540 int __init aa_alloc_root_ns(void) 540 int __init aa_alloc_root_ns(void)
541 { 541 {
542 /* released by aa_free_root_ns - used as list ref*/ 542 /* released by aa_free_root_ns - used as list ref*/
543 root_ns = alloc_namespace(NULL, "root"); 543 root_ns = alloc_namespace(NULL, "root");
544 if (!root_ns) 544 if (!root_ns)
545 return -ENOMEM; 545 return -ENOMEM;
546 546
547 return 0; 547 return 0;
548 } 548 }
549 549
550 /** 550 /**
551 * aa_free_root_ns - free the root profile namespace 551 * aa_free_root_ns - free the root profile namespace
552 */ 552 */
553 void __init aa_free_root_ns(void) 553 void __init aa_free_root_ns(void)
554 { 554 {
555 struct aa_namespace *ns = root_ns; 555 struct aa_namespace *ns = root_ns;
556 root_ns = NULL; 556 root_ns = NULL;
557 557
558 destroy_namespace(ns); 558 destroy_namespace(ns);
559 aa_put_namespace(ns); 559 aa_put_namespace(ns);
560 } 560 }
561 561
562 562
563 static void free_replacedby(struct aa_replacedby *r) 563 static void free_replacedby(struct aa_replacedby *r)
564 { 564 {
565 if (r) { 565 if (r) {
566 /* r->profile will not be updated any more as r is dead */ 566 /* r->profile will not be updated any more as r is dead */
567 aa_put_profile(rcu_dereference_protected(r->profile, true)); 567 aa_put_profile(rcu_dereference_protected(r->profile, true));
568 kzfree(r); 568 kzfree(r);
569 } 569 }
570 } 570 }
571 571
572 572
573 void aa_free_replacedby_kref(struct kref *kref) 573 void aa_free_replacedby_kref(struct kref *kref)
574 { 574 {
575 struct aa_replacedby *r = container_of(kref, struct aa_replacedby, 575 struct aa_replacedby *r = container_of(kref, struct aa_replacedby,
576 count); 576 count);
577 free_replacedby(r); 577 free_replacedby(r);
578 } 578 }
579 579
580 /** 580 /**
581 * aa_free_profile - free a profile 581 * aa_free_profile - free a profile
582 * @profile: the profile to free (MAYBE NULL) 582 * @profile: the profile to free (MAYBE NULL)
583 * 583 *
584 * Free a profile, its hats and null_profile. All references to the profile, 584 * Free a profile, its hats and null_profile. All references to the profile,
585 * its hats and null_profile must have been put. 585 * its hats and null_profile must have been put.
586 * 586 *
587 * If the profile was referenced from a task context, free_profile() will 587 * If the profile was referenced from a task context, free_profile() will
588 * be called from an rcu callback routine, so we must not sleep here. 588 * be called from an rcu callback routine, so we must not sleep here.
589 */ 589 */
590 void aa_free_profile(struct aa_profile *profile) 590 void aa_free_profile(struct aa_profile *profile)
591 { 591 {
592 AA_DEBUG("%s(%p)\n", __func__, profile); 592 AA_DEBUG("%s(%p)\n", __func__, profile);
593 593
594 if (!profile) 594 if (!profile)
595 return; 595 return;
596 596
597 /* free children profiles */ 597 /* free children profiles */
598 policy_destroy(&profile->base); 598 policy_destroy(&profile->base);
599 aa_put_profile(rcu_access_pointer(profile->parent)); 599 aa_put_profile(rcu_access_pointer(profile->parent));
600 600
601 aa_put_namespace(profile->ns); 601 aa_put_namespace(profile->ns);
602 kzfree(profile->rename); 602 kzfree(profile->rename);
603 603
604 aa_free_file_rules(&profile->file); 604 aa_free_file_rules(&profile->file);
605 aa_free_cap_rules(&profile->caps); 605 aa_free_cap_rules(&profile->caps);
606 aa_free_rlimit_rules(&profile->rlimits); 606 aa_free_rlimit_rules(&profile->rlimits);
607 607
608 kzfree(profile->dirname); 608 kzfree(profile->dirname);
609 aa_put_dfa(profile->xmatch); 609 aa_put_dfa(profile->xmatch);
610 aa_put_dfa(profile->policy.dfa); 610 aa_put_dfa(profile->policy.dfa);
611 aa_put_replacedby(profile->replacedby); 611 aa_put_replacedby(profile->replacedby);
612 612
613 kzfree(profile->hash);
613 kzfree(profile); 614 kzfree(profile);
614 } 615 }
615 616
616 /** 617 /**
617 * aa_free_profile_rcu - free aa_profile by rcu (called by aa_free_profile_kref) 618 * aa_free_profile_rcu - free aa_profile by rcu (called by aa_free_profile_kref)
618 * @head: rcu_head callback for freeing of a profile (NOT NULL) 619 * @head: rcu_head callback for freeing of a profile (NOT NULL)
619 */ 620 */
620 static void aa_free_profile_rcu(struct rcu_head *head) 621 static void aa_free_profile_rcu(struct rcu_head *head)
621 { 622 {
622 struct aa_profile *p = container_of(head, struct aa_profile, rcu); 623 struct aa_profile *p = container_of(head, struct aa_profile, rcu);
623 if (p->flags & PFLAG_NS_COUNT) 624 if (p->flags & PFLAG_NS_COUNT)
624 free_namespace(p->ns); 625 free_namespace(p->ns);
625 else 626 else
626 aa_free_profile(p); 627 aa_free_profile(p);
627 } 628 }
628 629
629 /** 630 /**
630 * aa_free_profile_kref - free aa_profile by kref (called by aa_put_profile) 631 * aa_free_profile_kref - free aa_profile by kref (called by aa_put_profile)
631 * @kr: kref callback for freeing of a profile (NOT NULL) 632 * @kr: kref callback for freeing of a profile (NOT NULL)
632 */ 633 */
633 void aa_free_profile_kref(struct kref *kref) 634 void aa_free_profile_kref(struct kref *kref)
634 { 635 {
635 struct aa_profile *p = container_of(kref, struct aa_profile, count); 636 struct aa_profile *p = container_of(kref, struct aa_profile, count);
636 call_rcu(&p->rcu, aa_free_profile_rcu); 637 call_rcu(&p->rcu, aa_free_profile_rcu);
637 } 638 }
638 639
639 /** 640 /**
640 * aa_alloc_profile - allocate, initialize and return a new profile 641 * aa_alloc_profile - allocate, initialize and return a new profile
641 * @hname: name of the profile (NOT NULL) 642 * @hname: name of the profile (NOT NULL)
642 * 643 *
643 * Returns: refcount profile or NULL on failure 644 * Returns: refcount profile or NULL on failure
644 */ 645 */
645 struct aa_profile *aa_alloc_profile(const char *hname) 646 struct aa_profile *aa_alloc_profile(const char *hname)
646 { 647 {
647 struct aa_profile *profile; 648 struct aa_profile *profile;
648 649
649 /* freed by free_profile - usually through aa_put_profile */ 650 /* freed by free_profile - usually through aa_put_profile */
650 profile = kzalloc(sizeof(*profile), GFP_KERNEL); 651 profile = kzalloc(sizeof(*profile), GFP_KERNEL);
651 if (!profile) 652 if (!profile)
652 return NULL; 653 return NULL;
653 654
654 profile->replacedby = kzalloc(sizeof(struct aa_replacedby), GFP_KERNEL); 655 profile->replacedby = kzalloc(sizeof(struct aa_replacedby), GFP_KERNEL);
655 if (!profile->replacedby) 656 if (!profile->replacedby)
656 goto fail; 657 goto fail;
657 kref_init(&profile->replacedby->count); 658 kref_init(&profile->replacedby->count);
658 659
659 if (!policy_init(&profile->base, NULL, hname)) 660 if (!policy_init(&profile->base, NULL, hname))
660 goto fail; 661 goto fail;
661 kref_init(&profile->count); 662 kref_init(&profile->count);
662 663
663 /* refcount released by caller */ 664 /* refcount released by caller */
664 return profile; 665 return profile;
665 666
666 fail: 667 fail:
667 kzfree(profile->replacedby); 668 kzfree(profile->replacedby);
668 kzfree(profile); 669 kzfree(profile);
669 670
670 return NULL; 671 return NULL;
671 } 672 }
672 673
673 /** 674 /**
674 * aa_new_null_profile - create a new null-X learning profile 675 * aa_new_null_profile - create a new null-X learning profile
675 * @parent: profile that caused this profile to be created (NOT NULL) 676 * @parent: profile that caused this profile to be created (NOT NULL)
676 * @hat: true if the null- learning profile is a hat 677 * @hat: true if the null- learning profile is a hat
677 * 678 *
678 * Create a null- complain mode profile used in learning mode. The name of 679 * Create a null- complain mode profile used in learning mode. The name of
679 * the profile is unique and follows the format of parent//null-<uniq>. 680 * the profile is unique and follows the format of parent//null-<uniq>.
680 * 681 *
681 * null profiles are added to the profile list but the list does not 682 * null profiles are added to the profile list but the list does not
682 * hold a count on them so that they are automatically released when 683 * hold a count on them so that they are automatically released when
683 * not in use. 684 * not in use.
684 * 685 *
685 * Returns: new refcounted profile else NULL on failure 686 * Returns: new refcounted profile else NULL on failure
686 */ 687 */
687 struct aa_profile *aa_new_null_profile(struct aa_profile *parent, int hat) 688 struct aa_profile *aa_new_null_profile(struct aa_profile *parent, int hat)
688 { 689 {
689 struct aa_profile *profile = NULL; 690 struct aa_profile *profile = NULL;
690 char *name; 691 char *name;
691 int uniq = atomic_inc_return(&parent->ns->uniq_null); 692 int uniq = atomic_inc_return(&parent->ns->uniq_null);
692 693
693 /* freed below */ 694 /* freed below */
694 name = kmalloc(strlen(parent->base.hname) + 2 + 7 + 8, GFP_KERNEL); 695 name = kmalloc(strlen(parent->base.hname) + 2 + 7 + 8, GFP_KERNEL);
695 if (!name) 696 if (!name)
696 goto fail; 697 goto fail;
697 sprintf(name, "%s//null-%x", parent->base.hname, uniq); 698 sprintf(name, "%s//null-%x", parent->base.hname, uniq);
698 699
699 profile = aa_alloc_profile(name); 700 profile = aa_alloc_profile(name);
700 kfree(name); 701 kfree(name);
701 if (!profile) 702 if (!profile)
702 goto fail; 703 goto fail;
703 704
704 profile->mode = APPARMOR_COMPLAIN; 705 profile->mode = APPARMOR_COMPLAIN;
705 profile->flags = PFLAG_NULL; 706 profile->flags = PFLAG_NULL;
706 if (hat) 707 if (hat)
707 profile->flags |= PFLAG_HAT; 708 profile->flags |= PFLAG_HAT;
708 709
709 /* released on free_profile */ 710 /* released on free_profile */
710 rcu_assign_pointer(profile->parent, aa_get_profile(parent)); 711 rcu_assign_pointer(profile->parent, aa_get_profile(parent));
711 profile->ns = aa_get_namespace(parent->ns); 712 profile->ns = aa_get_namespace(parent->ns);
712 713
713 mutex_lock(&profile->ns->lock); 714 mutex_lock(&profile->ns->lock);
714 __list_add_profile(&parent->base.profiles, profile); 715 __list_add_profile(&parent->base.profiles, profile);
715 mutex_unlock(&profile->ns->lock); 716 mutex_unlock(&profile->ns->lock);
716 717
717 /* refcount released by caller */ 718 /* refcount released by caller */
718 return profile; 719 return profile;
719 720
720 fail: 721 fail:
721 return NULL; 722 return NULL;
722 } 723 }
723 724
724 /* TODO: profile accounting - setup in remove */ 725 /* TODO: profile accounting - setup in remove */
725 726
726 /** 727 /**
727 * __find_child - find a profile on @head list with a name matching @name 728 * __find_child - find a profile on @head list with a name matching @name
728 * @head: list to search (NOT NULL) 729 * @head: list to search (NOT NULL)
729 * @name: name of profile (NOT NULL) 730 * @name: name of profile (NOT NULL)
730 * 731 *
731 * Requires: rcu_read_lock be held 732 * Requires: rcu_read_lock be held
732 * 733 *
733 * Returns: unrefcounted profile ptr, or NULL if not found 734 * Returns: unrefcounted profile ptr, or NULL if not found
734 */ 735 */
735 static struct aa_profile *__find_child(struct list_head *head, const char *name) 736 static struct aa_profile *__find_child(struct list_head *head, const char *name)
736 { 737 {
737 return (struct aa_profile *)__policy_find(head, name); 738 return (struct aa_profile *)__policy_find(head, name);
738 } 739 }
739 740
740 /** 741 /**
741 * __strn_find_child - find a profile on @head list using substring of @name 742 * __strn_find_child - find a profile on @head list using substring of @name
742 * @head: list to search (NOT NULL) 743 * @head: list to search (NOT NULL)
743 * @name: name of profile (NOT NULL) 744 * @name: name of profile (NOT NULL)
744 * @len: length of @name substring to match 745 * @len: length of @name substring to match
745 * 746 *
746 * Requires: rcu_read_lock be held 747 * Requires: rcu_read_lock be held
747 * 748 *
748 * Returns: unrefcounted profile ptr, or NULL if not found 749 * Returns: unrefcounted profile ptr, or NULL if not found
749 */ 750 */
750 static struct aa_profile *__strn_find_child(struct list_head *head, 751 static struct aa_profile *__strn_find_child(struct list_head *head,
751 const char *name, int len) 752 const char *name, int len)
752 { 753 {
753 return (struct aa_profile *)__policy_strn_find(head, name, len); 754 return (struct aa_profile *)__policy_strn_find(head, name, len);
754 } 755 }
755 756
756 /** 757 /**
757 * aa_find_child - find a profile by @name in @parent 758 * aa_find_child - find a profile by @name in @parent
758 * @parent: profile to search (NOT NULL) 759 * @parent: profile to search (NOT NULL)
759 * @name: profile name to search for (NOT NULL) 760 * @name: profile name to search for (NOT NULL)
760 * 761 *
761 * Returns: a refcounted profile or NULL if not found 762 * Returns: a refcounted profile or NULL if not found
762 */ 763 */
763 struct aa_profile *aa_find_child(struct aa_profile *parent, const char *name) 764 struct aa_profile *aa_find_child(struct aa_profile *parent, const char *name)
764 { 765 {
765 struct aa_profile *profile; 766 struct aa_profile *profile;
766 767
767 rcu_read_lock(); 768 rcu_read_lock();
768 profile = aa_get_profile(__find_child(&parent->base.profiles, name)); 769 profile = aa_get_profile(__find_child(&parent->base.profiles, name));
769 rcu_read_unlock(); 770 rcu_read_unlock();
770 771
771 /* refcount released by caller */ 772 /* refcount released by caller */
772 return profile; 773 return profile;
773 } 774 }
774 775
775 /** 776 /**
776 * __lookup_parent - lookup the parent of a profile of name @hname 777 * __lookup_parent - lookup the parent of a profile of name @hname
777 * @ns: namespace to lookup profile in (NOT NULL) 778 * @ns: namespace to lookup profile in (NOT NULL)
778 * @hname: hierarchical profile name to find parent of (NOT NULL) 779 * @hname: hierarchical profile name to find parent of (NOT NULL)
779 * 780 *
780 * Lookups up the parent of a fully qualified profile name, the profile 781 * Lookups up the parent of a fully qualified profile name, the profile
781 * that matches hname does not need to exist, in general this 782 * that matches hname does not need to exist, in general this
782 * is used to load a new profile. 783 * is used to load a new profile.
783 * 784 *
784 * Requires: rcu_read_lock be held 785 * Requires: rcu_read_lock be held
785 * 786 *
786 * Returns: unrefcounted policy or NULL if not found 787 * Returns: unrefcounted policy or NULL if not found
787 */ 788 */
788 static struct aa_policy *__lookup_parent(struct aa_namespace *ns, 789 static struct aa_policy *__lookup_parent(struct aa_namespace *ns,
789 const char *hname) 790 const char *hname)
790 { 791 {
791 struct aa_policy *policy; 792 struct aa_policy *policy;
792 struct aa_profile *profile = NULL; 793 struct aa_profile *profile = NULL;
793 char *split; 794 char *split;
794 795
795 policy = &ns->base; 796 policy = &ns->base;
796 797
797 for (split = strstr(hname, "//"); split;) { 798 for (split = strstr(hname, "//"); split;) {
798 profile = __strn_find_child(&policy->profiles, hname, 799 profile = __strn_find_child(&policy->profiles, hname,
799 split - hname); 800 split - hname);
800 if (!profile) 801 if (!profile)
801 return NULL; 802 return NULL;
802 policy = &profile->base; 803 policy = &profile->base;
803 hname = split + 2; 804 hname = split + 2;
804 split = strstr(hname, "//"); 805 split = strstr(hname, "//");
805 } 806 }
806 if (!profile) 807 if (!profile)
807 return &ns->base; 808 return &ns->base;
808 return &profile->base; 809 return &profile->base;
809 } 810 }
810 811
811 /** 812 /**
812 * __lookup_profile - lookup the profile matching @hname 813 * __lookup_profile - lookup the profile matching @hname
813 * @base: base list to start looking up profile name from (NOT NULL) 814 * @base: base list to start looking up profile name from (NOT NULL)
814 * @hname: hierarchical profile name (NOT NULL) 815 * @hname: hierarchical profile name (NOT NULL)
815 * 816 *
816 * Requires: rcu_read_lock be held 817 * Requires: rcu_read_lock be held
817 * 818 *
818 * Returns: unrefcounted profile pointer or NULL if not found 819 * Returns: unrefcounted profile pointer or NULL if not found
819 * 820 *
820 * Do a relative name lookup, recursing through profile tree. 821 * Do a relative name lookup, recursing through profile tree.
821 */ 822 */
822 static struct aa_profile *__lookup_profile(struct aa_policy *base, 823 static struct aa_profile *__lookup_profile(struct aa_policy *base,
823 const char *hname) 824 const char *hname)
824 { 825 {
825 struct aa_profile *profile = NULL; 826 struct aa_profile *profile = NULL;
826 char *split; 827 char *split;
827 828
828 for (split = strstr(hname, "//"); split;) { 829 for (split = strstr(hname, "//"); split;) {
829 profile = __strn_find_child(&base->profiles, hname, 830 profile = __strn_find_child(&base->profiles, hname,
830 split - hname); 831 split - hname);
831 if (!profile) 832 if (!profile)
832 return NULL; 833 return NULL;
833 834
834 base = &profile->base; 835 base = &profile->base;
835 hname = split + 2; 836 hname = split + 2;
836 split = strstr(hname, "//"); 837 split = strstr(hname, "//");
837 } 838 }
838 839
839 profile = __find_child(&base->profiles, hname); 840 profile = __find_child(&base->profiles, hname);
840 841
841 return profile; 842 return profile;
842 } 843 }
843 844
844 /** 845 /**
845 * aa_lookup_profile - find a profile by its full or partial name 846 * aa_lookup_profile - find a profile by its full or partial name
846 * @ns: the namespace to start from (NOT NULL) 847 * @ns: the namespace to start from (NOT NULL)
847 * @hname: name to do lookup on. Does not contain namespace prefix (NOT NULL) 848 * @hname: name to do lookup on. Does not contain namespace prefix (NOT NULL)
848 * 849 *
849 * Returns: refcounted profile or NULL if not found 850 * Returns: refcounted profile or NULL if not found
850 */ 851 */
851 struct aa_profile *aa_lookup_profile(struct aa_namespace *ns, const char *hname) 852 struct aa_profile *aa_lookup_profile(struct aa_namespace *ns, const char *hname)
852 { 853 {
853 struct aa_profile *profile; 854 struct aa_profile *profile;
854 855
855 rcu_read_lock(); 856 rcu_read_lock();
856 do { 857 do {
857 profile = __lookup_profile(&ns->base, hname); 858 profile = __lookup_profile(&ns->base, hname);
858 } while (profile && !aa_get_profile_not0(profile)); 859 } while (profile && !aa_get_profile_not0(profile));
859 rcu_read_unlock(); 860 rcu_read_unlock();
860 861
861 /* the unconfined profile is not in the regular profile list */ 862 /* the unconfined profile is not in the regular profile list */
862 if (!profile && strcmp(hname, "unconfined") == 0) 863 if (!profile && strcmp(hname, "unconfined") == 0)
863 profile = aa_get_newest_profile(ns->unconfined); 864 profile = aa_get_newest_profile(ns->unconfined);
864 865
865 /* refcount released by caller */ 866 /* refcount released by caller */
866 return profile; 867 return profile;
867 } 868 }
868 869
869 /** 870 /**
870 * replacement_allowed - test to see if replacement is allowed 871 * replacement_allowed - test to see if replacement is allowed
871 * @profile: profile to test if it can be replaced (MAYBE NULL) 872 * @profile: profile to test if it can be replaced (MAYBE NULL)
872 * @noreplace: true if replacement shouldn't be allowed but addition is okay 873 * @noreplace: true if replacement shouldn't be allowed but addition is okay
873 * @info: Returns - info about why replacement failed (NOT NULL) 874 * @info: Returns - info about why replacement failed (NOT NULL)
874 * 875 *
875 * Returns: %0 if replacement allowed else error code 876 * Returns: %0 if replacement allowed else error code
876 */ 877 */
877 static int replacement_allowed(struct aa_profile *profile, int noreplace, 878 static int replacement_allowed(struct aa_profile *profile, int noreplace,
878 const char **info) 879 const char **info)
879 { 880 {
880 if (profile) { 881 if (profile) {
881 if (profile->flags & PFLAG_IMMUTABLE) { 882 if (profile->flags & PFLAG_IMMUTABLE) {
882 *info = "cannot replace immutible profile"; 883 *info = "cannot replace immutible profile";
883 return -EPERM; 884 return -EPERM;
884 } else if (noreplace) { 885 } else if (noreplace) {
885 *info = "profile already exists"; 886 *info = "profile already exists";
886 return -EEXIST; 887 return -EEXIST;
887 } 888 }
888 } 889 }
889 return 0; 890 return 0;
890 } 891 }
891 892
892 /** 893 /**
893 * aa_audit_policy - Do auditing of policy changes 894 * aa_audit_policy - Do auditing of policy changes
894 * @op: policy operation being performed 895 * @op: policy operation being performed
895 * @gfp: memory allocation flags 896 * @gfp: memory allocation flags
896 * @name: name of profile being manipulated (NOT NULL) 897 * @name: name of profile being manipulated (NOT NULL)
897 * @info: any extra information to be audited (MAYBE NULL) 898 * @info: any extra information to be audited (MAYBE NULL)
898 * @error: error code 899 * @error: error code
899 * 900 *
900 * Returns: the error to be returned after audit is done 901 * Returns: the error to be returned after audit is done
901 */ 902 */
902 static int audit_policy(int op, gfp_t gfp, const char *name, const char *info, 903 static int audit_policy(int op, gfp_t gfp, const char *name, const char *info,
903 int error) 904 int error)
904 { 905 {
905 struct common_audit_data sa; 906 struct common_audit_data sa;
906 struct apparmor_audit_data aad = {0,}; 907 struct apparmor_audit_data aad = {0,};
907 sa.type = LSM_AUDIT_DATA_NONE; 908 sa.type = LSM_AUDIT_DATA_NONE;
908 sa.aad = &aad; 909 sa.aad = &aad;
909 aad.op = op; 910 aad.op = op;
910 aad.name = name; 911 aad.name = name;
911 aad.info = info; 912 aad.info = info;
912 aad.error = error; 913 aad.error = error;
913 914
914 return aa_audit(AUDIT_APPARMOR_STATUS, __aa_current_profile(), gfp, 915 return aa_audit(AUDIT_APPARMOR_STATUS, __aa_current_profile(), gfp,
915 &sa, NULL); 916 &sa, NULL);
916 } 917 }
917 918
918 /** 919 /**
919 * aa_may_manage_policy - can the current task manage policy 920 * aa_may_manage_policy - can the current task manage policy
920 * @op: the policy manipulation operation being done 921 * @op: the policy manipulation operation being done
921 * 922 *
922 * Returns: true if the task is allowed to manipulate policy 923 * Returns: true if the task is allowed to manipulate policy
923 */ 924 */
924 bool aa_may_manage_policy(int op) 925 bool aa_may_manage_policy(int op)
925 { 926 {
926 /* check if loading policy is locked out */ 927 /* check if loading policy is locked out */
927 if (aa_g_lock_policy) { 928 if (aa_g_lock_policy) {
928 audit_policy(op, GFP_KERNEL, NULL, "policy_locked", -EACCES); 929 audit_policy(op, GFP_KERNEL, NULL, "policy_locked", -EACCES);
929 return 0; 930 return 0;
930 } 931 }
931 932
932 if (!capable(CAP_MAC_ADMIN)) { 933 if (!capable(CAP_MAC_ADMIN)) {
933 audit_policy(op, GFP_KERNEL, NULL, "not policy admin", -EACCES); 934 audit_policy(op, GFP_KERNEL, NULL, "not policy admin", -EACCES);
934 return 0; 935 return 0;
935 } 936 }
936 937
937 return 1; 938 return 1;
938 } 939 }
939 940
940 static struct aa_profile *__list_lookup_parent(struct list_head *lh, 941 static struct aa_profile *__list_lookup_parent(struct list_head *lh,
941 struct aa_profile *profile) 942 struct aa_profile *profile)
942 { 943 {
943 const char *base = hname_tail(profile->base.hname); 944 const char *base = hname_tail(profile->base.hname);
944 long len = base - profile->base.hname; 945 long len = base - profile->base.hname;
945 struct aa_load_ent *ent; 946 struct aa_load_ent *ent;
946 947
947 /* parent won't have trailing // so remove from len */ 948 /* parent won't have trailing // so remove from len */
948 if (len <= 2) 949 if (len <= 2)
949 return NULL; 950 return NULL;
950 len -= 2; 951 len -= 2;
951 952
952 list_for_each_entry(ent, lh, list) { 953 list_for_each_entry(ent, lh, list) {
953 if (ent->new == profile) 954 if (ent->new == profile)
954 continue; 955 continue;
955 if (strncmp(ent->new->base.hname, profile->base.hname, len) == 956 if (strncmp(ent->new->base.hname, profile->base.hname, len) ==
956 0 && ent->new->base.hname[len] == 0) 957 0 && ent->new->base.hname[len] == 0)
957 return ent->new; 958 return ent->new;
958 } 959 }
959 960
960 return NULL; 961 return NULL;
961 } 962 }
962 963
963 /** 964 /**
964 * __replace_profile - replace @old with @new on a list 965 * __replace_profile - replace @old with @new on a list
965 * @old: profile to be replaced (NOT NULL) 966 * @old: profile to be replaced (NOT NULL)
966 * @new: profile to replace @old with (NOT NULL) 967 * @new: profile to replace @old with (NOT NULL)
967 * @share_replacedby: transfer @old->replacedby to @new 968 * @share_replacedby: transfer @old->replacedby to @new
968 * 969 *
969 * Will duplicate and refcount elements that @new inherits from @old 970 * Will duplicate and refcount elements that @new inherits from @old
970 * and will inherit @old children. 971 * and will inherit @old children.
971 * 972 *
972 * refcount @new for list, put @old list refcount 973 * refcount @new for list, put @old list refcount
973 * 974 *
974 * Requires: namespace list lock be held, or list not be shared 975 * Requires: namespace list lock be held, or list not be shared
975 */ 976 */
976 static void __replace_profile(struct aa_profile *old, struct aa_profile *new, 977 static void __replace_profile(struct aa_profile *old, struct aa_profile *new,
977 bool share_replacedby) 978 bool share_replacedby)
978 { 979 {
979 struct aa_profile *child, *tmp; 980 struct aa_profile *child, *tmp;
980 981
981 if (!list_empty(&old->base.profiles)) { 982 if (!list_empty(&old->base.profiles)) {
982 LIST_HEAD(lh); 983 LIST_HEAD(lh);
983 list_splice_init_rcu(&old->base.profiles, &lh, synchronize_rcu); 984 list_splice_init_rcu(&old->base.profiles, &lh, synchronize_rcu);
984 985
985 list_for_each_entry_safe(child, tmp, &lh, base.list) { 986 list_for_each_entry_safe(child, tmp, &lh, base.list) {
986 struct aa_profile *p; 987 struct aa_profile *p;
987 988
988 list_del_init(&child->base.list); 989 list_del_init(&child->base.list);
989 p = __find_child(&new->base.profiles, child->base.name); 990 p = __find_child(&new->base.profiles, child->base.name);
990 if (p) { 991 if (p) {
991 /* @p replaces @child */ 992 /* @p replaces @child */
992 __replace_profile(child, p, share_replacedby); 993 __replace_profile(child, p, share_replacedby);
993 continue; 994 continue;
994 } 995 }
995 996
996 /* inherit @child and its children */ 997 /* inherit @child and its children */
997 /* TODO: update hname of inherited children */ 998 /* TODO: update hname of inherited children */
998 /* list refcount transferred to @new */ 999 /* list refcount transferred to @new */
999 p = aa_deref_parent(child); 1000 p = aa_deref_parent(child);
1000 rcu_assign_pointer(child->parent, aa_get_profile(new)); 1001 rcu_assign_pointer(child->parent, aa_get_profile(new));
1001 list_add_rcu(&child->base.list, &new->base.profiles); 1002 list_add_rcu(&child->base.list, &new->base.profiles);
1002 aa_put_profile(p); 1003 aa_put_profile(p);
1003 } 1004 }
1004 } 1005 }
1005 1006
1006 if (!rcu_access_pointer(new->parent)) { 1007 if (!rcu_access_pointer(new->parent)) {
1007 struct aa_profile *parent = aa_deref_parent(old); 1008 struct aa_profile *parent = aa_deref_parent(old);
1008 rcu_assign_pointer(new->parent, aa_get_profile(parent)); 1009 rcu_assign_pointer(new->parent, aa_get_profile(parent));
1009 } 1010 }
1010 __aa_update_replacedby(old, new); 1011 __aa_update_replacedby(old, new);
1011 if (share_replacedby) { 1012 if (share_replacedby) {
1012 aa_put_replacedby(new->replacedby); 1013 aa_put_replacedby(new->replacedby);
1013 new->replacedby = aa_get_replacedby(old->replacedby); 1014 new->replacedby = aa_get_replacedby(old->replacedby);
1014 } else if (!rcu_access_pointer(new->replacedby->profile)) 1015 } else if (!rcu_access_pointer(new->replacedby->profile))
1015 /* aafs interface uses replacedby */ 1016 /* aafs interface uses replacedby */
1016 rcu_assign_pointer(new->replacedby->profile, 1017 rcu_assign_pointer(new->replacedby->profile,
1017 aa_get_profile(new)); 1018 aa_get_profile(new));
1018 __aa_fs_profile_migrate_dents(old, new); 1019 __aa_fs_profile_migrate_dents(old, new);
1019 1020
1020 if (list_empty(&new->base.list)) { 1021 if (list_empty(&new->base.list)) {
1021 /* new is not on a list already */ 1022 /* new is not on a list already */
1022 list_replace_rcu(&old->base.list, &new->base.list); 1023 list_replace_rcu(&old->base.list, &new->base.list);
1023 aa_get_profile(new); 1024 aa_get_profile(new);
1024 aa_put_profile(old); 1025 aa_put_profile(old);
1025 } else 1026 } else
1026 __list_remove_profile(old); 1027 __list_remove_profile(old);
1027 } 1028 }
1028 1029
1029 /** 1030 /**
1030 * __lookup_replace - lookup replacement information for a profile 1031 * __lookup_replace - lookup replacement information for a profile
1031 * @ns - namespace the lookup occurs in 1032 * @ns - namespace the lookup occurs in
1032 * @hname - name of profile to lookup 1033 * @hname - name of profile to lookup
1033 * @noreplace - true if not replacing an existing profile 1034 * @noreplace - true if not replacing an existing profile
1034 * @p - Returns: profile to be replaced 1035 * @p - Returns: profile to be replaced
1035 * @info - Returns: info string on why lookup failed 1036 * @info - Returns: info string on why lookup failed
1036 * 1037 *
1037 * Returns: profile to replace (no ref) on success else ptr error 1038 * Returns: profile to replace (no ref) on success else ptr error
1038 */ 1039 */
1039 static int __lookup_replace(struct aa_namespace *ns, const char *hname, 1040 static int __lookup_replace(struct aa_namespace *ns, const char *hname,
1040 bool noreplace, struct aa_profile **p, 1041 bool noreplace, struct aa_profile **p,
1041 const char **info) 1042 const char **info)
1042 { 1043 {
1043 *p = aa_get_profile(__lookup_profile(&ns->base, hname)); 1044 *p = aa_get_profile(__lookup_profile(&ns->base, hname));
1044 if (*p) { 1045 if (*p) {
1045 int error = replacement_allowed(*p, noreplace, info); 1046 int error = replacement_allowed(*p, noreplace, info);
1046 if (error) { 1047 if (error) {
1047 *info = "profile can not be replaced"; 1048 *info = "profile can not be replaced";
1048 return error; 1049 return error;
1049 } 1050 }
1050 } 1051 }
1051 1052
1052 return 0; 1053 return 0;
1053 } 1054 }
1054 1055
1055 /** 1056 /**
1056 * aa_replace_profiles - replace profile(s) on the profile list 1057 * aa_replace_profiles - replace profile(s) on the profile list
1057 * @udata: serialized data stream (NOT NULL) 1058 * @udata: serialized data stream (NOT NULL)
1058 * @size: size of the serialized data stream 1059 * @size: size of the serialized data stream
1059 * @noreplace: true if only doing addition, no replacement allowed 1060 * @noreplace: true if only doing addition, no replacement allowed
1060 * 1061 *
1061 * unpack and replace a profile on the profile list and uses of that profile 1062 * unpack and replace a profile on the profile list and uses of that profile
1062 * by any aa_task_cxt. If the profile does not exist on the profile list 1063 * by any aa_task_cxt. If the profile does not exist on the profile list
1063 * it is added. 1064 * it is added.
1064 * 1065 *
1065 * Returns: size of data consumed else error code on failure. 1066 * Returns: size of data consumed else error code on failure.
1066 */ 1067 */
1067 ssize_t aa_replace_profiles(void *udata, size_t size, bool noreplace) 1068 ssize_t aa_replace_profiles(void *udata, size_t size, bool noreplace)
1068 { 1069 {
1069 const char *ns_name, *name = NULL, *info = NULL; 1070 const char *ns_name, *name = NULL, *info = NULL;
1070 struct aa_namespace *ns = NULL; 1071 struct aa_namespace *ns = NULL;
1071 struct aa_load_ent *ent, *tmp; 1072 struct aa_load_ent *ent, *tmp;
1072 int op = OP_PROF_REPL; 1073 int op = OP_PROF_REPL;
1073 ssize_t error; 1074 ssize_t error;
1074 LIST_HEAD(lh); 1075 LIST_HEAD(lh);
1075 1076
1076 /* released below */ 1077 /* released below */
1077 error = aa_unpack(udata, size, &lh, &ns_name); 1078 error = aa_unpack(udata, size, &lh, &ns_name);
1078 if (error) 1079 if (error)
1079 goto out; 1080 goto out;
1080 1081
1081 /* released below */ 1082 /* released below */
1082 ns = aa_prepare_namespace(ns_name); 1083 ns = aa_prepare_namespace(ns_name);
1083 if (!ns) { 1084 if (!ns) {
1084 info = "failed to prepare namespace"; 1085 info = "failed to prepare namespace";
1085 error = -ENOMEM; 1086 error = -ENOMEM;
1086 name = ns_name; 1087 name = ns_name;
1087 goto fail; 1088 goto fail;
1088 } 1089 }
1089 1090
1090 mutex_lock(&ns->lock); 1091 mutex_lock(&ns->lock);
1091 /* setup parent and ns info */ 1092 /* setup parent and ns info */
1092 list_for_each_entry(ent, &lh, list) { 1093 list_for_each_entry(ent, &lh, list) {
1093 struct aa_policy *policy; 1094 struct aa_policy *policy;
1094 1095
1095 name = ent->new->base.hname; 1096 name = ent->new->base.hname;
1096 error = __lookup_replace(ns, ent->new->base.hname, noreplace, 1097 error = __lookup_replace(ns, ent->new->base.hname, noreplace,
1097 &ent->old, &info); 1098 &ent->old, &info);
1098 if (error) 1099 if (error)
1099 goto fail_lock; 1100 goto fail_lock;
1100 1101
1101 if (ent->new->rename) { 1102 if (ent->new->rename) {
1102 error = __lookup_replace(ns, ent->new->rename, 1103 error = __lookup_replace(ns, ent->new->rename,
1103 noreplace, &ent->rename, 1104 noreplace, &ent->rename,
1104 &info); 1105 &info);
1105 if (error) 1106 if (error)
1106 goto fail_lock; 1107 goto fail_lock;
1107 } 1108 }
1108 1109
1109 /* released when @new is freed */ 1110 /* released when @new is freed */
1110 ent->new->ns = aa_get_namespace(ns); 1111 ent->new->ns = aa_get_namespace(ns);
1111 1112
1112 if (ent->old || ent->rename) 1113 if (ent->old || ent->rename)
1113 continue; 1114 continue;
1114 1115
1115 /* no ref on policy only use inside lock */ 1116 /* no ref on policy only use inside lock */
1116 policy = __lookup_parent(ns, ent->new->base.hname); 1117 policy = __lookup_parent(ns, ent->new->base.hname);
1117 if (!policy) { 1118 if (!policy) {
1118 struct aa_profile *p; 1119 struct aa_profile *p;
1119 p = __list_lookup_parent(&lh, ent->new); 1120 p = __list_lookup_parent(&lh, ent->new);
1120 if (!p) { 1121 if (!p) {
1121 error = -ENOENT; 1122 error = -ENOENT;
1122 info = "parent does not exist"; 1123 info = "parent does not exist";
1123 name = ent->new->base.hname; 1124 name = ent->new->base.hname;
1124 goto fail_lock; 1125 goto fail_lock;
1125 } 1126 }
1126 rcu_assign_pointer(ent->new->parent, aa_get_profile(p)); 1127 rcu_assign_pointer(ent->new->parent, aa_get_profile(p));
1127 } else if (policy != &ns->base) { 1128 } else if (policy != &ns->base) {
1128 /* released on profile replacement or free_profile */ 1129 /* released on profile replacement or free_profile */
1129 struct aa_profile *p = (struct aa_profile *) policy; 1130 struct aa_profile *p = (struct aa_profile *) policy;
1130 rcu_assign_pointer(ent->new->parent, aa_get_profile(p)); 1131 rcu_assign_pointer(ent->new->parent, aa_get_profile(p));
1131 } 1132 }
1132 } 1133 }
1133 1134
1134 /* create new fs entries for introspection if needed */ 1135 /* create new fs entries for introspection if needed */
1135 list_for_each_entry(ent, &lh, list) { 1136 list_for_each_entry(ent, &lh, list) {
1136 if (ent->old) { 1137 if (ent->old) {
1137 /* inherit old interface files */ 1138 /* inherit old interface files */
1138 1139
1139 /* if (ent->rename) 1140 /* if (ent->rename)
1140 TODO: support rename */ 1141 TODO: support rename */
1141 /* } else if (ent->rename) { 1142 /* } else if (ent->rename) {
1142 TODO: support rename */ 1143 TODO: support rename */
1143 } else { 1144 } else {
1144 struct dentry *parent; 1145 struct dentry *parent;
1145 if (rcu_access_pointer(ent->new->parent)) { 1146 if (rcu_access_pointer(ent->new->parent)) {
1146 struct aa_profile *p; 1147 struct aa_profile *p;
1147 p = aa_deref_parent(ent->new); 1148 p = aa_deref_parent(ent->new);
1148 parent = prof_child_dir(p); 1149 parent = prof_child_dir(p);
1149 } else 1150 } else
1150 parent = ns_subprofs_dir(ent->new->ns); 1151 parent = ns_subprofs_dir(ent->new->ns);
1151 error = __aa_fs_profile_mkdir(ent->new, parent); 1152 error = __aa_fs_profile_mkdir(ent->new, parent);
1152 } 1153 }
1153 1154
1154 if (error) { 1155 if (error) {
1155 info = "failed to create "; 1156 info = "failed to create ";
1156 goto fail_lock; 1157 goto fail_lock;
1157 } 1158 }
1158 } 1159 }
1159 1160
1160 /* Done with checks that may fail - do actual replacement */ 1161 /* Done with checks that may fail - do actual replacement */
1161 list_for_each_entry_safe(ent, tmp, &lh, list) { 1162 list_for_each_entry_safe(ent, tmp, &lh, list) {
1162 list_del_init(&ent->list); 1163 list_del_init(&ent->list);
1163 op = (!ent->old && !ent->rename) ? OP_PROF_LOAD : OP_PROF_REPL; 1164 op = (!ent->old && !ent->rename) ? OP_PROF_LOAD : OP_PROF_REPL;
1164 1165
1165 audit_policy(op, GFP_ATOMIC, ent->new->base.name, NULL, error); 1166 audit_policy(op, GFP_ATOMIC, ent->new->base.name, NULL, error);
1166 1167
1167 if (ent->old) { 1168 if (ent->old) {
1168 __replace_profile(ent->old, ent->new, 1); 1169 __replace_profile(ent->old, ent->new, 1);
1169 if (ent->rename) { 1170 if (ent->rename) {
1170 /* aafs interface uses replacedby */ 1171 /* aafs interface uses replacedby */
1171 struct aa_replacedby *r = ent->new->replacedby; 1172 struct aa_replacedby *r = ent->new->replacedby;
1172 rcu_assign_pointer(r->profile, 1173 rcu_assign_pointer(r->profile,
1173 aa_get_profile(ent->new)); 1174 aa_get_profile(ent->new));
1174 __replace_profile(ent->rename, ent->new, 0); 1175 __replace_profile(ent->rename, ent->new, 0);
1175 } 1176 }
1176 } else if (ent->rename) { 1177 } else if (ent->rename) {
1177 /* aafs interface uses replacedby */ 1178 /* aafs interface uses replacedby */
1178 rcu_assign_pointer(ent->new->replacedby->profile, 1179 rcu_assign_pointer(ent->new->replacedby->profile,
1179 aa_get_profile(ent->new)); 1180 aa_get_profile(ent->new));
1180 __replace_profile(ent->rename, ent->new, 0); 1181 __replace_profile(ent->rename, ent->new, 0);
1181 } else if (ent->new->parent) { 1182 } else if (ent->new->parent) {
1182 struct aa_profile *parent, *newest; 1183 struct aa_profile *parent, *newest;
1183 parent = aa_deref_parent(ent->new); 1184 parent = aa_deref_parent(ent->new);
1184 newest = aa_get_newest_profile(parent); 1185 newest = aa_get_newest_profile(parent);
1185 1186
1186 /* parent replaced in this atomic set? */ 1187 /* parent replaced in this atomic set? */
1187 if (newest != parent) { 1188 if (newest != parent) {
1188 aa_get_profile(newest); 1189 aa_get_profile(newest);
1189 aa_put_profile(parent); 1190 aa_put_profile(parent);
1190 rcu_assign_pointer(ent->new->parent, newest); 1191 rcu_assign_pointer(ent->new->parent, newest);
1191 } else 1192 } else
1192 aa_put_profile(newest); 1193 aa_put_profile(newest);
1193 /* aafs interface uses replacedby */ 1194 /* aafs interface uses replacedby */
1194 rcu_assign_pointer(ent->new->replacedby->profile, 1195 rcu_assign_pointer(ent->new->replacedby->profile,
1195 aa_get_profile(ent->new)); 1196 aa_get_profile(ent->new));
1196 __list_add_profile(&parent->base.profiles, ent->new); 1197 __list_add_profile(&parent->base.profiles, ent->new);
1197 } else { 1198 } else {
1198 /* aafs interface uses replacedby */ 1199 /* aafs interface uses replacedby */
1199 rcu_assign_pointer(ent->new->replacedby->profile, 1200 rcu_assign_pointer(ent->new->replacedby->profile,
1200 aa_get_profile(ent->new)); 1201 aa_get_profile(ent->new));
1201 __list_add_profile(&ns->base.profiles, ent->new); 1202 __list_add_profile(&ns->base.profiles, ent->new);
1202 } 1203 }
1203 aa_load_ent_free(ent); 1204 aa_load_ent_free(ent);
1204 } 1205 }
1205 mutex_unlock(&ns->lock); 1206 mutex_unlock(&ns->lock);
1206 1207
1207 out: 1208 out:
1208 aa_put_namespace(ns); 1209 aa_put_namespace(ns);
1209 1210
1210 if (error) 1211 if (error)
1211 return error; 1212 return error;
1212 return size; 1213 return size;
1213 1214
1214 fail_lock: 1215 fail_lock:
1215 mutex_unlock(&ns->lock); 1216 mutex_unlock(&ns->lock);
1216 fail: 1217 fail:
1217 error = audit_policy(op, GFP_KERNEL, name, info, error); 1218 error = audit_policy(op, GFP_KERNEL, name, info, error);
1218 1219
1219 list_for_each_entry_safe(ent, tmp, &lh, list) { 1220 list_for_each_entry_safe(ent, tmp, &lh, list) {
1220 list_del_init(&ent->list); 1221 list_del_init(&ent->list);
1221 aa_load_ent_free(ent); 1222 aa_load_ent_free(ent);
1222 } 1223 }
1223 1224
1224 goto out; 1225 goto out;
1225 } 1226 }
1226 1227
1227 /** 1228 /**
1228 * aa_remove_profiles - remove profile(s) from the system 1229 * aa_remove_profiles - remove profile(s) from the system
1229 * @fqname: name of the profile or namespace to remove (NOT NULL) 1230 * @fqname: name of the profile or namespace to remove (NOT NULL)
1230 * @size: size of the name 1231 * @size: size of the name
1231 * 1232 *
1232 * Remove a profile or sub namespace from the current namespace, so that 1233 * Remove a profile or sub namespace from the current namespace, so that
1233 * they can not be found anymore and mark them as replaced by unconfined 1234 * they can not be found anymore and mark them as replaced by unconfined
1234 * 1235 *
1235 * NOTE: removing confinement does not restore rlimits to preconfinemnet values 1236 * NOTE: removing confinement does not restore rlimits to preconfinemnet values
1236 * 1237 *
1237 * Returns: size of data consume else error code if fails 1238 * Returns: size of data consume else error code if fails
1238 */ 1239 */
1239 ssize_t aa_remove_profiles(char *fqname, size_t size) 1240 ssize_t aa_remove_profiles(char *fqname, size_t size)
1240 { 1241 {
1241 struct aa_namespace *root, *ns = NULL; 1242 struct aa_namespace *root, *ns = NULL;
1242 struct aa_profile *profile = NULL; 1243 struct aa_profile *profile = NULL;
1243 const char *name = fqname, *info = NULL; 1244 const char *name = fqname, *info = NULL;
1244 ssize_t error = 0; 1245 ssize_t error = 0;
1245 1246
1246 if (*fqname == 0) { 1247 if (*fqname == 0) {
1247 info = "no profile specified"; 1248 info = "no profile specified";
1248 error = -ENOENT; 1249 error = -ENOENT;
1249 goto fail; 1250 goto fail;
1250 } 1251 }
1251 1252
1252 root = aa_current_profile()->ns; 1253 root = aa_current_profile()->ns;
1253 1254
1254 if (fqname[0] == ':') { 1255 if (fqname[0] == ':') {
1255 char *ns_name; 1256 char *ns_name;
1256 name = aa_split_fqname(fqname, &ns_name); 1257 name = aa_split_fqname(fqname, &ns_name);
1257 /* released below */ 1258 /* released below */
1258 ns = aa_find_namespace(root, ns_name); 1259 ns = aa_find_namespace(root, ns_name);
1259 if (!ns) { 1260 if (!ns) {
1260 info = "namespace does not exist"; 1261 info = "namespace does not exist";
1261 error = -ENOENT; 1262 error = -ENOENT;
1262 goto fail; 1263 goto fail;
1263 } 1264 }
1264 } else 1265 } else
1265 /* released below */ 1266 /* released below */
1266 ns = aa_get_namespace(root); 1267 ns = aa_get_namespace(root);
1267 1268
1268 if (!name) { 1269 if (!name) {
1269 /* remove namespace - can only happen if fqname[0] == ':' */ 1270 /* remove namespace - can only happen if fqname[0] == ':' */
1270 mutex_lock(&ns->parent->lock); 1271 mutex_lock(&ns->parent->lock);
1271 __remove_namespace(ns); 1272 __remove_namespace(ns);
1272 mutex_unlock(&ns->parent->lock); 1273 mutex_unlock(&ns->parent->lock);
1273 } else { 1274 } else {
1274 /* remove profile */ 1275 /* remove profile */
1275 mutex_lock(&ns->lock); 1276 mutex_lock(&ns->lock);
1276 profile = aa_get_profile(__lookup_profile(&ns->base, name)); 1277 profile = aa_get_profile(__lookup_profile(&ns->base, name));
1277 if (!profile) { 1278 if (!profile) {
1278 error = -ENOENT; 1279 error = -ENOENT;
1279 info = "profile does not exist"; 1280 info = "profile does not exist";
1280 goto fail_ns_lock; 1281 goto fail_ns_lock;
1281 } 1282 }
1282 name = profile->base.hname; 1283 name = profile->base.hname;
1283 __remove_profile(profile); 1284 __remove_profile(profile);
1284 mutex_unlock(&ns->lock); 1285 mutex_unlock(&ns->lock);
1285 } 1286 }
1286 1287
1287 /* don't fail removal if audit fails */ 1288 /* don't fail removal if audit fails */
1288 (void) audit_policy(OP_PROF_RM, GFP_KERNEL, name, info, error); 1289 (void) audit_policy(OP_PROF_RM, GFP_KERNEL, name, info, error);
1289 aa_put_namespace(ns); 1290 aa_put_namespace(ns);
1290 aa_put_profile(profile); 1291 aa_put_profile(profile);
1291 return size; 1292 return size;
1292 1293
1293 fail_ns_lock: 1294 fail_ns_lock:
1294 mutex_unlock(&ns->lock); 1295 mutex_unlock(&ns->lock);
1295 aa_put_namespace(ns); 1296 aa_put_namespace(ns);
1296 1297
1297 fail: 1298 fail:
1298 (void) audit_policy(OP_PROF_RM, GFP_KERNEL, name, info, error); 1299 (void) audit_policy(OP_PROF_RM, GFP_KERNEL, name, info, error);
1299 return error; 1300 return error;
1300 } 1301 }
1301 1302