Blame view
kernel/audit_tree.c
22.7 KB
74c3cbe33 [PATCH] audit: wa... |
1 |
#include "audit.h" |
28a3a7eb3 audit: reimplemen... |
2 |
#include <linux/fsnotify_backend.h> |
74c3cbe33 [PATCH] audit: wa... |
3 4 |
#include <linux/namei.h> #include <linux/mount.h> |
916d75761 Fix rule eviction... |
5 |
#include <linux/kthread.h> |
5a0e3ad6a include cleanup: ... |
6 |
#include <linux/slab.h> |
74c3cbe33 [PATCH] audit: wa... |
7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 |
struct audit_tree; struct audit_chunk; struct audit_tree { atomic_t count; int goner; struct audit_chunk *root; struct list_head chunks; struct list_head rules; struct list_head list; struct list_head same_root; struct rcu_head head; char pathname[]; }; struct audit_chunk { struct list_head hash; |
e61ce8673 fsnotify: rename ... |
25 |
struct fsnotify_mark mark; |
74c3cbe33 [PATCH] audit: wa... |
26 27 28 |
struct list_head trees; /* with root here */ int dead; int count; |
8f7b0ba1c Fix inotify watch... |
29 |
atomic_long_t refs; |
74c3cbe33 [PATCH] audit: wa... |
30 31 32 33 34 35 36 37 38 39 |
struct rcu_head head; struct node { struct list_head list; struct audit_tree *owner; unsigned index; /* index; upper bit indicates 'will prune' */ } owners[]; }; static LIST_HEAD(tree_list); static LIST_HEAD(prune_list); |
f1aaf2622 audit: move the t... |
40 |
static struct task_struct *prune_thread; |
74c3cbe33 [PATCH] audit: wa... |
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 |
/* * One struct chunk is attached to each inode of interest. * We replace struct chunk on tagging/untagging. * Rules have pointer to struct audit_tree. * Rules have struct list_head rlist forming a list of rules over * the same tree. * References to struct chunk are collected at audit_inode{,_child}() * time and used in AUDIT_TREE rule matching. * These references are dropped at the same time we are calling * audit_free_names(), etc. * * Cyclic lists galore: * tree.chunks anchors chunk.owners[].list hash_lock * tree.rules anchors rule.rlist audit_filter_mutex * chunk.trees anchors tree.same_root hash_lock * chunk.hash is a hash with middle bits of watch.inode as * a hash function. RCU, hash_lock * * tree is refcounted; one reference for "some rules on rules_list refer to * it", one for each chunk with pointer to it. * |
28a3a7eb3 audit: reimplemen... |
63 |
* chunk is refcounted by embedded fsnotify_mark + .refs (non-zero refcount |
8f7b0ba1c Fix inotify watch... |
64 |
* of watch contributes 1 to .refs). |
74c3cbe33 [PATCH] audit: wa... |
65 66 67 68 69 70 |
* * node.index allows to get from node.list to containing chunk. * MSB of that sucker is stolen to mark taggings that we might have to * revert - several operations have very unpleasant cleanup logics and * that makes a difference. Some. */ |
28a3a7eb3 audit: reimplemen... |
71 |
static struct fsnotify_group *audit_tree_group; |
74c3cbe33 [PATCH] audit: wa... |
72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 |
static struct audit_tree *alloc_tree(const char *s) { struct audit_tree *tree; tree = kmalloc(sizeof(struct audit_tree) + strlen(s) + 1, GFP_KERNEL); if (tree) { atomic_set(&tree->count, 1); tree->goner = 0; INIT_LIST_HEAD(&tree->chunks); INIT_LIST_HEAD(&tree->rules); INIT_LIST_HEAD(&tree->list); INIT_LIST_HEAD(&tree->same_root); tree->root = NULL; strcpy(tree->pathname, s); } return tree; } static inline void get_tree(struct audit_tree *tree) { atomic_inc(&tree->count); } |
74c3cbe33 [PATCH] audit: wa... |
95 96 97 |
static inline void put_tree(struct audit_tree *tree) { if (atomic_dec_and_test(&tree->count)) |
3b097c469 audit_tree,rcu: C... |
98 |
kfree_rcu(tree, head); |
74c3cbe33 [PATCH] audit: wa... |
99 100 101 102 103 104 105 |
} /* to avoid bringing the entire thing in audit.h */ const char *audit_tree_path(struct audit_tree *tree) { return tree->pathname; } |
8f7b0ba1c Fix inotify watch... |
106 |
static void free_chunk(struct audit_chunk *chunk) |
74c3cbe33 [PATCH] audit: wa... |
107 |
{ |
74c3cbe33 [PATCH] audit: wa... |
108 109 110 111 112 113 114 115 |
int i; for (i = 0; i < chunk->count; i++) { if (chunk->owners[i].owner) put_tree(chunk->owners[i].owner); } kfree(chunk); } |
8f7b0ba1c Fix inotify watch... |
116 |
void audit_put_chunk(struct audit_chunk *chunk) |
74c3cbe33 [PATCH] audit: wa... |
117 |
{ |
8f7b0ba1c Fix inotify watch... |
118 119 |
if (atomic_long_dec_and_test(&chunk->refs)) free_chunk(chunk); |
74c3cbe33 [PATCH] audit: wa... |
120 |
} |
8f7b0ba1c Fix inotify watch... |
121 |
static void __put_chunk(struct rcu_head *rcu) |
74c3cbe33 [PATCH] audit: wa... |
122 |
{ |
8f7b0ba1c Fix inotify watch... |
123 124 |
struct audit_chunk *chunk = container_of(rcu, struct audit_chunk, head); audit_put_chunk(chunk); |
74c3cbe33 [PATCH] audit: wa... |
125 |
} |
e61ce8673 fsnotify: rename ... |
126 |
static void audit_tree_destroy_watch(struct fsnotify_mark *entry) |
28a3a7eb3 audit: reimplemen... |
127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 |
{ struct audit_chunk *chunk = container_of(entry, struct audit_chunk, mark); call_rcu(&chunk->head, __put_chunk); } static struct audit_chunk *alloc_chunk(int count) { struct audit_chunk *chunk; size_t size; int i; size = offsetof(struct audit_chunk, owners) + count * sizeof(struct node); chunk = kzalloc(size, GFP_KERNEL); if (!chunk) return NULL; INIT_LIST_HEAD(&chunk->hash); INIT_LIST_HEAD(&chunk->trees); chunk->count = count; atomic_long_set(&chunk->refs, 1); for (i = 0; i < count; i++) { INIT_LIST_HEAD(&chunk->owners[i].list); chunk->owners[i].index = i; } fsnotify_init_mark(&chunk->mark, audit_tree_destroy_watch); |
799b60145 audit: keep inode... |
152 |
chunk->mark.mask = FS_IN_IGNORED; |
28a3a7eb3 audit: reimplemen... |
153 154 |
return chunk; } |
74c3cbe33 [PATCH] audit: wa... |
155 156 157 158 159 160 161 162 163 |
enum {HASH_SIZE = 128}; static struct list_head chunk_hash_heads[HASH_SIZE]; static __cacheline_aligned_in_smp DEFINE_SPINLOCK(hash_lock); static inline struct list_head *chunk_hash(const struct inode *inode) { unsigned long n = (unsigned long)inode / L1_CACHE_BYTES; return chunk_hash_heads + n % HASH_SIZE; } |
28a3a7eb3 audit: reimplemen... |
164 |
/* hash_lock & entry->lock is held by caller */ |
74c3cbe33 [PATCH] audit: wa... |
165 166 |
static void insert_hash(struct audit_chunk *chunk) { |
e61ce8673 fsnotify: rename ... |
167 |
struct fsnotify_mark *entry = &chunk->mark; |
28a3a7eb3 audit: reimplemen... |
168 |
struct list_head *list; |
0809ab69a fsnotify: unify i... |
169 |
if (!entry->inode) |
28a3a7eb3 audit: reimplemen... |
170 |
return; |
0809ab69a fsnotify: unify i... |
171 |
list = chunk_hash(entry->inode); |
74c3cbe33 [PATCH] audit: wa... |
172 173 174 175 176 177 178 |
list_add_rcu(&chunk->hash, list); } /* called under rcu_read_lock */ struct audit_chunk *audit_tree_lookup(const struct inode *inode) { struct list_head *list = chunk_hash(inode); |
6793a051f [PATCH] list_for_... |
179 |
struct audit_chunk *p; |
74c3cbe33 [PATCH] audit: wa... |
180 |
|
6793a051f [PATCH] list_for_... |
181 |
list_for_each_entry_rcu(p, list, hash) { |
28a3a7eb3 audit: reimplemen... |
182 |
/* mark.inode may have gone NULL, but who cares? */ |
0809ab69a fsnotify: unify i... |
183 |
if (p->mark.inode == inode) { |
8f7b0ba1c Fix inotify watch... |
184 |
atomic_long_inc(&p->refs); |
74c3cbe33 [PATCH] audit: wa... |
185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 |
return p; } } return NULL; } int audit_tree_match(struct audit_chunk *chunk, struct audit_tree *tree) { int n; for (n = 0; n < chunk->count; n++) if (chunk->owners[n].owner == tree) return 1; return 0; } /* tagging and untagging inodes with trees */ |
8f7b0ba1c Fix inotify watch... |
201 202 203 204 205 206 207 208 |
static struct audit_chunk *find_chunk(struct node *p) { int index = p->index & ~(1U<<31); p -= index; return container_of(p, struct audit_chunk, owners[0]); } static void untag_chunk(struct node *p) |
74c3cbe33 [PATCH] audit: wa... |
209 |
{ |
8f7b0ba1c Fix inotify watch... |
210 |
struct audit_chunk *chunk = find_chunk(p); |
e61ce8673 fsnotify: rename ... |
211 |
struct fsnotify_mark *entry = &chunk->mark; |
f7a998a94 in untag_chunk() ... |
212 |
struct audit_chunk *new = NULL; |
74c3cbe33 [PATCH] audit: wa... |
213 214 215 |
struct audit_tree *owner; int size = chunk->count - 1; int i, j; |
28a3a7eb3 audit: reimplemen... |
216 |
fsnotify_get_mark(entry); |
8f7b0ba1c Fix inotify watch... |
217 218 |
spin_unlock(&hash_lock); |
f7a998a94 in untag_chunk() ... |
219 220 |
if (size) new = alloc_chunk(size); |
28a3a7eb3 audit: reimplemen... |
221 |
spin_lock(&entry->lock); |
0809ab69a fsnotify: unify i... |
222 |
if (chunk->dead || !entry->inode) { |
28a3a7eb3 audit: reimplemen... |
223 |
spin_unlock(&entry->lock); |
f7a998a94 in untag_chunk() ... |
224 225 |
if (new) free_chunk(new); |
8f7b0ba1c Fix inotify watch... |
226 |
goto out; |
74c3cbe33 [PATCH] audit: wa... |
227 228 229 230 231 232 233 234 235 236 237 238 239 |
} owner = p->owner; if (!size) { chunk->dead = 1; spin_lock(&hash_lock); list_del_init(&chunk->trees); if (owner->root == chunk) owner->root = NULL; list_del_init(&p->list); list_del_rcu(&chunk->hash); spin_unlock(&hash_lock); |
28a3a7eb3 audit: reimplemen... |
240 |
spin_unlock(&entry->lock); |
e2a29943e fsnotify: pass gr... |
241 |
fsnotify_destroy_mark(entry, audit_tree_group); |
8f7b0ba1c Fix inotify watch... |
242 |
goto out; |
74c3cbe33 [PATCH] audit: wa... |
243 |
} |
74c3cbe33 [PATCH] audit: wa... |
244 245 |
if (!new) goto Fallback; |
f7a998a94 in untag_chunk() ... |
246 |
|
28a3a7eb3 audit: reimplemen... |
247 |
fsnotify_duplicate_mark(&new->mark, entry); |
0809ab69a fsnotify: unify i... |
248 |
if (fsnotify_add_mark(&new->mark, new->mark.group, new->mark.inode, NULL, 1)) { |
0fe33aae0 audit: don't free... |
249 |
fsnotify_put_mark(&new->mark); |
74c3cbe33 [PATCH] audit: wa... |
250 251 252 253 254 255 256 257 258 259 |
goto Fallback; } chunk->dead = 1; spin_lock(&hash_lock); list_replace_init(&chunk->trees, &new->trees); if (owner->root == chunk) { list_del_init(&owner->same_root); owner->root = NULL; } |
6f5d51148 fix braindamage i... |
260 |
for (i = j = 0; j <= size; i++, j++) { |
74c3cbe33 [PATCH] audit: wa... |
261 262 263 264 265 266 267 268 269 270 271 272 |
struct audit_tree *s; if (&chunk->owners[j] == p) { list_del_init(&p->list); i--; continue; } s = chunk->owners[j].owner; new->owners[i].owner = s; new->owners[i].index = chunk->owners[j].index - j + i; if (!s) /* result of earlier fallback */ continue; get_tree(s); |
6f5d51148 fix braindamage i... |
273 |
list_replace_init(&chunk->owners[j].list, &new->owners[i].list); |
74c3cbe33 [PATCH] audit: wa... |
274 275 276 277 278 279 |
} list_replace_rcu(&chunk->hash, &new->hash); list_for_each_entry(owner, &new->trees, same_root) owner->root = new; spin_unlock(&hash_lock); |
28a3a7eb3 audit: reimplemen... |
280 |
spin_unlock(&entry->lock); |
e2a29943e fsnotify: pass gr... |
281 |
fsnotify_destroy_mark(entry, audit_tree_group); |
b3e8692b4 audit: clean up r... |
282 |
fsnotify_put_mark(&new->mark); /* drop initial reference */ |
8f7b0ba1c Fix inotify watch... |
283 |
goto out; |
74c3cbe33 [PATCH] audit: wa... |
284 285 286 287 288 289 290 291 292 293 294 295 |
Fallback: // do the best we can spin_lock(&hash_lock); if (owner->root == chunk) { list_del_init(&owner->same_root); owner->root = NULL; } list_del_init(&p->list); p->owner = NULL; put_tree(owner); spin_unlock(&hash_lock); |
28a3a7eb3 audit: reimplemen... |
296 |
spin_unlock(&entry->lock); |
8f7b0ba1c Fix inotify watch... |
297 |
out: |
28a3a7eb3 audit: reimplemen... |
298 |
fsnotify_put_mark(entry); |
8f7b0ba1c Fix inotify watch... |
299 |
spin_lock(&hash_lock); |
74c3cbe33 [PATCH] audit: wa... |
300 301 302 303 |
} static int create_chunk(struct inode *inode, struct audit_tree *tree) { |
e61ce8673 fsnotify: rename ... |
304 |
struct fsnotify_mark *entry; |
74c3cbe33 [PATCH] audit: wa... |
305 306 307 |
struct audit_chunk *chunk = alloc_chunk(1); if (!chunk) return -ENOMEM; |
28a3a7eb3 audit: reimplemen... |
308 |
entry = &chunk->mark; |
5444e2981 fsnotify: split g... |
309 |
if (fsnotify_add_mark(entry, audit_tree_group, inode, NULL, 0)) { |
0fe33aae0 audit: don't free... |
310 |
fsnotify_put_mark(entry); |
74c3cbe33 [PATCH] audit: wa... |
311 312 |
return -ENOSPC; } |
28a3a7eb3 audit: reimplemen... |
313 |
spin_lock(&entry->lock); |
74c3cbe33 [PATCH] audit: wa... |
314 315 316 317 |
spin_lock(&hash_lock); if (tree->goner) { spin_unlock(&hash_lock); chunk->dead = 1; |
28a3a7eb3 audit: reimplemen... |
318 |
spin_unlock(&entry->lock); |
e2a29943e fsnotify: pass gr... |
319 |
fsnotify_destroy_mark(entry, audit_tree_group); |
28a3a7eb3 audit: reimplemen... |
320 |
fsnotify_put_mark(entry); |
74c3cbe33 [PATCH] audit: wa... |
321 322 323 324 325 326 327 328 329 330 331 332 |
return 0; } chunk->owners[0].index = (1U << 31); chunk->owners[0].owner = tree; get_tree(tree); list_add(&chunk->owners[0].list, &tree->chunks); if (!tree->root) { tree->root = chunk; list_add(&tree->same_root, &chunk->trees); } insert_hash(chunk); spin_unlock(&hash_lock); |
28a3a7eb3 audit: reimplemen... |
333 |
spin_unlock(&entry->lock); |
b3e8692b4 audit: clean up r... |
334 |
fsnotify_put_mark(entry); /* drop initial reference */ |
74c3cbe33 [PATCH] audit: wa... |
335 336 337 338 339 340 |
return 0; } /* the first tagged inode becomes root of tree */ static int tag_chunk(struct inode *inode, struct audit_tree *tree) { |
e61ce8673 fsnotify: rename ... |
341 |
struct fsnotify_mark *old_entry, *chunk_entry; |
74c3cbe33 [PATCH] audit: wa... |
342 343 344 345 |
struct audit_tree *owner; struct audit_chunk *chunk, *old; struct node *p; int n; |
5444e2981 fsnotify: split g... |
346 |
old_entry = fsnotify_find_inode_mark(audit_tree_group, inode); |
28a3a7eb3 audit: reimplemen... |
347 |
if (!old_entry) |
74c3cbe33 [PATCH] audit: wa... |
348 |
return create_chunk(inode, tree); |
28a3a7eb3 audit: reimplemen... |
349 |
old = container_of(old_entry, struct audit_chunk, mark); |
74c3cbe33 [PATCH] audit: wa... |
350 351 352 353 354 355 |
/* are we already there? */ spin_lock(&hash_lock); for (n = 0; n < old->count; n++) { if (old->owners[n].owner == tree) { spin_unlock(&hash_lock); |
28a3a7eb3 audit: reimplemen... |
356 |
fsnotify_put_mark(old_entry); |
74c3cbe33 [PATCH] audit: wa... |
357 358 359 360 361 362 |
return 0; } } spin_unlock(&hash_lock); chunk = alloc_chunk(old->count + 1); |
b4c30aad3 fix more leaks in... |
363 |
if (!chunk) { |
28a3a7eb3 audit: reimplemen... |
364 |
fsnotify_put_mark(old_entry); |
74c3cbe33 [PATCH] audit: wa... |
365 |
return -ENOMEM; |
b4c30aad3 fix more leaks in... |
366 |
} |
74c3cbe33 [PATCH] audit: wa... |
367 |
|
28a3a7eb3 audit: reimplemen... |
368 369 370 |
chunk_entry = &chunk->mark; spin_lock(&old_entry->lock); |
0809ab69a fsnotify: unify i... |
371 |
if (!old_entry->inode) { |
28a3a7eb3 audit: reimplemen... |
372 373 374 |
/* old_entry is being shot, lets just lie */ spin_unlock(&old_entry->lock); fsnotify_put_mark(old_entry); |
74c3cbe33 [PATCH] audit: wa... |
375 |
free_chunk(chunk); |
28a3a7eb3 audit: reimplemen... |
376 377 378 379 |
return -ENOENT; } fsnotify_duplicate_mark(chunk_entry, old_entry); |
0809ab69a fsnotify: unify i... |
380 |
if (fsnotify_add_mark(chunk_entry, chunk_entry->group, chunk_entry->inode, NULL, 1)) { |
28a3a7eb3 audit: reimplemen... |
381 |
spin_unlock(&old_entry->lock); |
0fe33aae0 audit: don't free... |
382 |
fsnotify_put_mark(chunk_entry); |
28a3a7eb3 audit: reimplemen... |
383 |
fsnotify_put_mark(old_entry); |
74c3cbe33 [PATCH] audit: wa... |
384 385 |
return -ENOSPC; } |
28a3a7eb3 audit: reimplemen... |
386 387 388 |
/* even though we hold old_entry->lock, this is safe since chunk_entry->lock could NEVER have been grabbed before */ spin_lock(&chunk_entry->lock); |
74c3cbe33 [PATCH] audit: wa... |
389 |
spin_lock(&hash_lock); |
28a3a7eb3 audit: reimplemen... |
390 391 |
/* we now hold old_entry->lock, chunk_entry->lock, and hash_lock */ |
74c3cbe33 [PATCH] audit: wa... |
392 393 394 |
if (tree->goner) { spin_unlock(&hash_lock); chunk->dead = 1; |
28a3a7eb3 audit: reimplemen... |
395 396 |
spin_unlock(&chunk_entry->lock); spin_unlock(&old_entry->lock); |
e2a29943e fsnotify: pass gr... |
397 |
fsnotify_destroy_mark(chunk_entry, audit_tree_group); |
28a3a7eb3 audit: reimplemen... |
398 399 400 |
fsnotify_put_mark(chunk_entry); fsnotify_put_mark(old_entry); |
74c3cbe33 [PATCH] audit: wa... |
401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 |
return 0; } list_replace_init(&old->trees, &chunk->trees); for (n = 0, p = chunk->owners; n < old->count; n++, p++) { struct audit_tree *s = old->owners[n].owner; p->owner = s; p->index = old->owners[n].index; if (!s) /* result of fallback in untag */ continue; get_tree(s); list_replace_init(&old->owners[n].list, &p->list); } p->index = (chunk->count - 1) | (1U<<31); p->owner = tree; get_tree(tree); list_add(&p->list, &tree->chunks); list_replace_rcu(&old->hash, &chunk->hash); list_for_each_entry(owner, &chunk->trees, same_root) owner->root = chunk; old->dead = 1; if (!tree->root) { tree->root = chunk; list_add(&tree->same_root, &chunk->trees); } spin_unlock(&hash_lock); |
28a3a7eb3 audit: reimplemen... |
426 427 |
spin_unlock(&chunk_entry->lock); spin_unlock(&old_entry->lock); |
e2a29943e fsnotify: pass gr... |
428 |
fsnotify_destroy_mark(old_entry, audit_tree_group); |
b3e8692b4 audit: clean up r... |
429 |
fsnotify_put_mark(chunk_entry); /* drop initial reference */ |
28a3a7eb3 audit: reimplemen... |
430 |
fsnotify_put_mark(old_entry); /* pair to fsnotify_find mark_entry */ |
74c3cbe33 [PATCH] audit: wa... |
431 432 |
return 0; } |
2991dd2b0 audit: rename aud... |
433 |
static void audit_tree_log_remove_rule(struct audit_krule *rule) |
0644ec0cc audit: catch poss... |
434 435 436 437 438 439 440 |
{ struct audit_buffer *ab; ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE); if (unlikely(!ab)) return; audit_log_format(ab, "op="); |
e7df61f4d audit: invalid op... |
441 |
audit_log_string(ab, "remove_rule"); |
0644ec0cc audit: catch poss... |
442 443 444 445 446 447 |
audit_log_format(ab, " dir="); audit_log_untrustedstring(ab, rule->tree->pathname); audit_log_key(ab, rule->filterkey); audit_log_format(ab, " list=%d res=1", rule->listnr); audit_log_end(ab); } |
74c3cbe33 [PATCH] audit: wa... |
448 449 450 451 |
static void kill_rules(struct audit_tree *tree) { struct audit_krule *rule, *next; struct audit_entry *entry; |
74c3cbe33 [PATCH] audit: wa... |
452 453 454 455 456 457 458 |
list_for_each_entry_safe(rule, next, &tree->rules, rlist) { entry = container_of(rule, struct audit_entry, rule); list_del_init(&rule->rlist); if (rule->tree) { /* not a half-baked one */ |
2991dd2b0 audit: rename aud... |
459 |
audit_tree_log_remove_rule(rule); |
34d99af52 audit: implement ... |
460 461 |
if (entry->rule.exe) audit_remove_mark(entry->rule.exe); |
74c3cbe33 [PATCH] audit: wa... |
462 463 |
rule->tree = NULL; list_del_rcu(&entry->list); |
e45aa212e audit rules order... |
464 |
list_del(&entry->rule.list); |
74c3cbe33 [PATCH] audit: wa... |
465 466 467 468 469 470 471 472 473 474 475 476 477 |
call_rcu(&entry->rcu, audit_free_rule_rcu); } } } /* * finish killing struct audit_tree */ static void prune_one(struct audit_tree *victim) { spin_lock(&hash_lock); while (!list_empty(&victim->chunks)) { struct node *p; |
74c3cbe33 [PATCH] audit: wa... |
478 479 |
p = list_entry(victim->chunks.next, struct node, list); |
74c3cbe33 [PATCH] audit: wa... |
480 |
|
8f7b0ba1c Fix inotify watch... |
481 |
untag_chunk(p); |
74c3cbe33 [PATCH] audit: wa... |
482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 |
} spin_unlock(&hash_lock); put_tree(victim); } /* trim the uncommitted chunks from tree */ static void trim_marked(struct audit_tree *tree) { struct list_head *p, *q; spin_lock(&hash_lock); if (tree->goner) { spin_unlock(&hash_lock); return; } /* reorder */ for (p = tree->chunks.next; p != &tree->chunks; p = q) { struct node *node = list_entry(p, struct node, list); q = p->next; if (node->index & (1U<<31)) { list_del_init(p); list_add(p, &tree->chunks); } } while (!list_empty(&tree->chunks)) { struct node *node; |
74c3cbe33 [PATCH] audit: wa... |
509 510 511 512 513 514 |
node = list_entry(tree->chunks.next, struct node, list); /* have we run out of marked? */ if (!(node->index & (1U<<31))) break; |
8f7b0ba1c Fix inotify watch... |
515 |
untag_chunk(node); |
74c3cbe33 [PATCH] audit: wa... |
516 517 518 519 520 521 522 523 524 525 526 527 528 |
} if (!tree->root && !tree->goner) { tree->goner = 1; spin_unlock(&hash_lock); mutex_lock(&audit_filter_mutex); kill_rules(tree); list_del_init(&tree->list); mutex_unlock(&audit_filter_mutex); prune_one(tree); } else { spin_unlock(&hash_lock); } } |
916d75761 Fix rule eviction... |
529 |
static void audit_schedule_prune(void); |
74c3cbe33 [PATCH] audit: wa... |
530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 |
/* called with audit_filter_mutex */ int audit_remove_tree_rule(struct audit_krule *rule) { struct audit_tree *tree; tree = rule->tree; if (tree) { spin_lock(&hash_lock); list_del_init(&rule->rlist); if (list_empty(&tree->rules) && !tree->goner) { tree->root = NULL; list_del_init(&tree->same_root); tree->goner = 1; list_move(&tree->list, &prune_list); rule->tree = NULL; spin_unlock(&hash_lock); audit_schedule_prune(); return 1; } rule->tree = NULL; spin_unlock(&hash_lock); return 1; } return 0; } |
1f707137b new helper: itera... |
554 555 |
static int compare_root(struct vfsmount *mnt, void *arg) { |
3b362157b VFS: audit: d_bac... |
556 |
return d_backing_inode(mnt->mnt_root) == arg; |
1f707137b new helper: itera... |
557 |
} |
74c3cbe33 [PATCH] audit: wa... |
558 559 560 561 562 563 564 565 |
void audit_trim_trees(void) { struct list_head cursor; mutex_lock(&audit_filter_mutex); list_add(&cursor, &tree_list); while (cursor.next != &tree_list) { struct audit_tree *tree; |
98bc993f9 [PATCH] get rid o... |
566 |
struct path path; |
74c3cbe33 [PATCH] audit: wa... |
567 568 |
struct vfsmount *root_mnt; struct node *node; |
74c3cbe33 [PATCH] audit: wa... |
569 570 571 572 573 574 575 |
int err; tree = container_of(cursor.next, struct audit_tree, list); get_tree(tree); list_del(&cursor); list_add(&cursor, &tree->list); mutex_unlock(&audit_filter_mutex); |
98bc993f9 [PATCH] get rid o... |
576 |
err = kern_path(tree->pathname, 0, &path); |
74c3cbe33 [PATCH] audit: wa... |
577 578 |
if (err) goto skip_it; |
589ff870e Switch collect_mo... |
579 |
root_mnt = collect_mounts(&path); |
98bc993f9 [PATCH] get rid o... |
580 |
path_put(&path); |
be34d1a3b VFS: Make clone_m... |
581 |
if (IS_ERR(root_mnt)) |
74c3cbe33 [PATCH] audit: wa... |
582 |
goto skip_it; |
74c3cbe33 [PATCH] audit: wa... |
583 584 |
spin_lock(&hash_lock); list_for_each_entry(node, &tree->chunks, list) { |
28a3a7eb3 audit: reimplemen... |
585 |
struct audit_chunk *chunk = find_chunk(node); |
25985edce Fix common misspe... |
586 |
/* this could be NULL if the watch is dying else where... */ |
0809ab69a fsnotify: unify i... |
587 |
struct inode *inode = chunk->mark.inode; |
74c3cbe33 [PATCH] audit: wa... |
588 |
node->index |= 1U<<31; |
1f707137b new helper: itera... |
589 590 |
if (iterate_mounts(compare_root, inode, root_mnt)) node->index &= ~(1U<<31); |
74c3cbe33 [PATCH] audit: wa... |
591 592 593 |
} spin_unlock(&hash_lock); trim_marked(tree); |
74c3cbe33 [PATCH] audit: wa... |
594 595 |
drop_collected_mounts(root_mnt); skip_it: |
12b2f117f kernel/audit_tree... |
596 |
put_tree(tree); |
74c3cbe33 [PATCH] audit: wa... |
597 598 599 600 601 |
mutex_lock(&audit_filter_mutex); } list_del(&cursor); mutex_unlock(&audit_filter_mutex); } |
74c3cbe33 [PATCH] audit: wa... |
602 603 604 605 606 |
int audit_make_tree(struct audit_krule *rule, char *pathname, u32 op) { if (pathname[0] != '/' || rule->listnr != AUDIT_FILTER_EXIT || |
5af75d8d5 audit: validate c... |
607 |
op != Audit_equal || |
74c3cbe33 [PATCH] audit: wa... |
608 609 610 611 612 613 614 615 616 617 618 619 |
rule->inode_f || rule->watch || rule->tree) return -EINVAL; rule->tree = alloc_tree(pathname); if (!rule->tree) return -ENOMEM; return 0; } void audit_put_tree(struct audit_tree *tree) { put_tree(tree); } |
1f707137b new helper: itera... |
620 621 |
static int tag_mount(struct vfsmount *mnt, void *arg) { |
3b362157b VFS: audit: d_bac... |
622 |
return tag_chunk(d_backing_inode(mnt->mnt_root), arg); |
1f707137b new helper: itera... |
623 |
} |
f1aaf2622 audit: move the t... |
624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 |
/* * That gets run when evict_chunk() ends up needing to kill audit_tree. * Runs from a separate thread. */ static int prune_tree_thread(void *unused) { for (;;) { set_current_state(TASK_INTERRUPTIBLE); if (list_empty(&prune_list)) schedule(); __set_current_state(TASK_RUNNING); mutex_lock(&audit_cmd_mutex); mutex_lock(&audit_filter_mutex); while (!list_empty(&prune_list)) { struct audit_tree *victim; victim = list_entry(prune_list.next, struct audit_tree, list); list_del_init(&victim->list); mutex_unlock(&audit_filter_mutex); prune_one(victim); mutex_lock(&audit_filter_mutex); } mutex_unlock(&audit_filter_mutex); mutex_unlock(&audit_cmd_mutex); } return 0; } static int audit_launch_prune(void) { if (prune_thread) return 0; prune_thread = kthread_create(prune_tree_thread, NULL, "audit_prune_tree"); if (IS_ERR(prune_thread)) { pr_err("cannot start thread audit_prune_tree"); prune_thread = NULL; return -ENOMEM; } else { wake_up_process(prune_thread); return 0; } } |
74c3cbe33 [PATCH] audit: wa... |
674 675 676 677 |
/* called with audit_filter_mutex */ int audit_add_tree_rule(struct audit_krule *rule) { struct audit_tree *seed = rule->tree, *tree; |
98bc993f9 [PATCH] get rid o... |
678 |
struct path path; |
1f707137b new helper: itera... |
679 |
struct vfsmount *mnt; |
74c3cbe33 [PATCH] audit: wa... |
680 |
int err; |
736f3203a kernel/audit_tree... |
681 |
rule->tree = NULL; |
74c3cbe33 [PATCH] audit: wa... |
682 683 684 685 686 687 688 689 690 691 692 693 694 |
list_for_each_entry(tree, &tree_list, list) { if (!strcmp(seed->pathname, tree->pathname)) { put_tree(seed); rule->tree = tree; list_add(&rule->rlist, &tree->rules); return 0; } } tree = seed; list_add(&tree->list, &tree_list); list_add(&rule->rlist, &tree->rules); /* do not set rule->tree yet */ mutex_unlock(&audit_filter_mutex); |
f1aaf2622 audit: move the t... |
695 696 697 698 699 |
if (unlikely(!prune_thread)) { err = audit_launch_prune(); if (err) goto Err; } |
98bc993f9 [PATCH] get rid o... |
700 |
err = kern_path(tree->pathname, 0, &path); |
74c3cbe33 [PATCH] audit: wa... |
701 702 |
if (err) goto Err; |
589ff870e Switch collect_mo... |
703 |
mnt = collect_mounts(&path); |
98bc993f9 [PATCH] get rid o... |
704 |
path_put(&path); |
be34d1a3b VFS: Make clone_m... |
705 706 |
if (IS_ERR(mnt)) { err = PTR_ERR(mnt); |
74c3cbe33 [PATCH] audit: wa... |
707 708 |
goto Err; } |
74c3cbe33 [PATCH] audit: wa... |
709 710 |
get_tree(tree); |
1f707137b new helper: itera... |
711 |
err = iterate_mounts(tag_mount, tree, mnt); |
74c3cbe33 [PATCH] audit: wa... |
712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 |
drop_collected_mounts(mnt); if (!err) { struct node *node; spin_lock(&hash_lock); list_for_each_entry(node, &tree->chunks, list) node->index &= ~(1U<<31); spin_unlock(&hash_lock); } else { trim_marked(tree); goto Err; } mutex_lock(&audit_filter_mutex); if (list_empty(&rule->rlist)) { put_tree(tree); return -ENOENT; } rule->tree = tree; put_tree(tree); return 0; Err: mutex_lock(&audit_filter_mutex); list_del_init(&tree->list); list_del_init(&tree->rules); put_tree(tree); return err; } int audit_tag_tree(char *old, char *new) { struct list_head cursor, barrier; int failed = 0; |
2096f759a New helper: path_... |
746 |
struct path path1, path2; |
74c3cbe33 [PATCH] audit: wa... |
747 |
struct vfsmount *tagged; |
74c3cbe33 [PATCH] audit: wa... |
748 |
int err; |
2096f759a New helper: path_... |
749 |
err = kern_path(new, 0, &path2); |
74c3cbe33 [PATCH] audit: wa... |
750 751 |
if (err) return err; |
2096f759a New helper: path_... |
752 753 |
tagged = collect_mounts(&path2); path_put(&path2); |
be34d1a3b VFS: Make clone_m... |
754 755 |
if (IS_ERR(tagged)) return PTR_ERR(tagged); |
74c3cbe33 [PATCH] audit: wa... |
756 |
|
2096f759a New helper: path_... |
757 |
err = kern_path(old, 0, &path1); |
74c3cbe33 [PATCH] audit: wa... |
758 759 760 761 |
if (err) { drop_collected_mounts(tagged); return err; } |
74c3cbe33 [PATCH] audit: wa... |
762 |
|
74c3cbe33 [PATCH] audit: wa... |
763 764 765 766 767 768 |
mutex_lock(&audit_filter_mutex); list_add(&barrier, &tree_list); list_add(&cursor, &barrier); while (cursor.next != &tree_list) { struct audit_tree *tree; |
2096f759a New helper: path_... |
769 |
int good_one = 0; |
74c3cbe33 [PATCH] audit: wa... |
770 771 772 773 774 775 |
tree = container_of(cursor.next, struct audit_tree, list); get_tree(tree); list_del(&cursor); list_add(&cursor, &tree->list); mutex_unlock(&audit_filter_mutex); |
2096f759a New helper: path_... |
776 777 778 779 |
err = kern_path(tree->pathname, 0, &path2); if (!err) { good_one = path_is_under(&path1, &path2); path_put(&path2); |
74c3cbe33 [PATCH] audit: wa... |
780 |
} |
2096f759a New helper: path_... |
781 |
if (!good_one) { |
74c3cbe33 [PATCH] audit: wa... |
782 783 784 785 |
put_tree(tree); mutex_lock(&audit_filter_mutex); continue; } |
74c3cbe33 [PATCH] audit: wa... |
786 |
|
1f707137b new helper: itera... |
787 |
failed = iterate_mounts(tag_mount, tree, tagged); |
74c3cbe33 [PATCH] audit: wa... |
788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 |
if (failed) { put_tree(tree); mutex_lock(&audit_filter_mutex); break; } mutex_lock(&audit_filter_mutex); spin_lock(&hash_lock); if (!tree->goner) { list_del(&tree->list); list_add(&tree->list, &tree_list); } spin_unlock(&hash_lock); put_tree(tree); } while (barrier.prev != &tree_list) { struct audit_tree *tree; tree = container_of(barrier.prev, struct audit_tree, list); get_tree(tree); list_del(&tree->list); list_add(&tree->list, &barrier); mutex_unlock(&audit_filter_mutex); if (!failed) { struct node *node; spin_lock(&hash_lock); list_for_each_entry(node, &tree->chunks, list) node->index &= ~(1U<<31); spin_unlock(&hash_lock); } else { trim_marked(tree); } put_tree(tree); mutex_lock(&audit_filter_mutex); } list_del(&barrier); list_del(&cursor); |
74c3cbe33 [PATCH] audit: wa... |
828 |
mutex_unlock(&audit_filter_mutex); |
2096f759a New helper: path_... |
829 |
path_put(&path1); |
74c3cbe33 [PATCH] audit: wa... |
830 831 832 |
drop_collected_mounts(tagged); return failed; } |
916d75761 Fix rule eviction... |
833 834 835 |
static void audit_schedule_prune(void) { |
f1aaf2622 audit: move the t... |
836 |
wake_up_process(prune_thread); |
916d75761 Fix rule eviction... |
837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 |
} /* * ... and that one is done if evict_chunk() decides to delay until the end * of syscall. Runs synchronously. */ void audit_kill_trees(struct list_head *list) { mutex_lock(&audit_cmd_mutex); mutex_lock(&audit_filter_mutex); while (!list_empty(list)) { struct audit_tree *victim; victim = list_entry(list->next, struct audit_tree, list); kill_rules(victim); list_del_init(&victim->list); mutex_unlock(&audit_filter_mutex); prune_one(victim); mutex_lock(&audit_filter_mutex); } mutex_unlock(&audit_filter_mutex); mutex_unlock(&audit_cmd_mutex); |
74c3cbe33 [PATCH] audit: wa... |
864 865 866 867 868 |
} /* * Here comes the stuff asynchronous to auditctl operations */ |
74c3cbe33 [PATCH] audit: wa... |
869 870 871 |
static void evict_chunk(struct audit_chunk *chunk) { struct audit_tree *owner; |
916d75761 Fix rule eviction... |
872 873 |
struct list_head *postponed = audit_killed_trees(); int need_prune = 0; |
74c3cbe33 [PATCH] audit: wa... |
874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 |
int n; if (chunk->dead) return; chunk->dead = 1; mutex_lock(&audit_filter_mutex); spin_lock(&hash_lock); while (!list_empty(&chunk->trees)) { owner = list_entry(chunk->trees.next, struct audit_tree, same_root); owner->goner = 1; owner->root = NULL; list_del_init(&owner->same_root); spin_unlock(&hash_lock); |
916d75761 Fix rule eviction... |
889 890 891 892 893 894 895 |
if (!postponed) { kill_rules(owner); list_move(&owner->list, &prune_list); need_prune = 1; } else { list_move(&owner->list, postponed); } |
74c3cbe33 [PATCH] audit: wa... |
896 897 898 899 900 901 |
spin_lock(&hash_lock); } list_del_rcu(&chunk->hash); for (n = 0; n < chunk->count; n++) list_del_init(&chunk->owners[n].list); spin_unlock(&hash_lock); |
f1aaf2622 audit: move the t... |
902 |
mutex_unlock(&audit_filter_mutex); |
916d75761 Fix rule eviction... |
903 904 |
if (need_prune) audit_schedule_prune(); |
74c3cbe33 [PATCH] audit: wa... |
905 |
} |
3a9b16b40 fsnotify: send fs... |
906 |
static int audit_tree_handle_event(struct fsnotify_group *group, |
7053aee26 fsnotify: do not ... |
907 |
struct inode *to_tell, |
ce8f76fb7 fsnotify: pass bo... |
908 |
struct fsnotify_mark *inode_mark, |
7053aee26 fsnotify: do not ... |
909 910 |
struct fsnotify_mark *vfsmount_mark, u32 mask, void *data, int data_type, |
45a22f4c1 inotify: Fix repo... |
911 |
const unsigned char *file_name, u32 cookie) |
74c3cbe33 [PATCH] audit: wa... |
912 |
{ |
83c4c4b0a fsnotify: remove ... |
913 |
return 0; |
28a3a7eb3 audit: reimplemen... |
914 |
} |
74c3cbe33 [PATCH] audit: wa... |
915 |
|
e61ce8673 fsnotify: rename ... |
916 |
static void audit_tree_freeing_mark(struct fsnotify_mark *entry, struct fsnotify_group *group) |
28a3a7eb3 audit: reimplemen... |
917 918 919 920 |
{ struct audit_chunk *chunk = container_of(entry, struct audit_chunk, mark); evict_chunk(chunk); |
b3e8692b4 audit: clean up r... |
921 922 923 924 925 926 |
/* * We are guaranteed to have at least one reference to the mark from * either the inode or the caller of fsnotify_destroy_mark(). */ BUG_ON(atomic_read(&entry->refcnt) < 1); |
74c3cbe33 [PATCH] audit: wa... |
927 |
} |
28a3a7eb3 audit: reimplemen... |
928 929 |
static const struct fsnotify_ops audit_tree_ops = { .handle_event = audit_tree_handle_event, |
28a3a7eb3 audit: reimplemen... |
930 |
.freeing_mark = audit_tree_freeing_mark, |
74c3cbe33 [PATCH] audit: wa... |
931 932 933 934 935 |
}; static int __init audit_tree_init(void) { int i; |
0d2e2a1d0 fsnotify: drop ma... |
936 |
audit_tree_group = fsnotify_alloc_group(&audit_tree_ops); |
28a3a7eb3 audit: reimplemen... |
937 938 |
if (IS_ERR(audit_tree_group)) audit_panic("cannot initialize fsnotify group for rectree watches"); |
74c3cbe33 [PATCH] audit: wa... |
939 940 941 942 943 944 945 |
for (i = 0; i < HASH_SIZE; i++) INIT_LIST_HEAD(&chunk_hash_heads[i]); return 0; } __initcall(audit_tree_init); |