diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2012-08-15 06:55:22 -0400 |
---|---|---|
committer | Miklos Szeredi <mszeredi@suse.cz> | 2012-08-15 06:55:22 -0400 |
commit | 0fe33aae0e94b4097dd433c9399e16e17d638cd8 (patch) | |
tree | 799d8107cc7b000c1fba87f87b59cb6d467dc9a2 /kernel/audit_tree.c | |
parent | ddf343f635fe4440cad528e12f96f28bd50aa099 (diff) |
audit: don't free_chunk() after fsnotify_add_mark()
Don't do free_chunk() after fsnotify_add_mark(). That one does a delayed unref
via the destroy list and this results in use-after-free.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Acked-by: Eric Paris <eparis@redhat.com>
CC: stable@vger.kernel.org
Diffstat (limited to 'kernel/audit_tree.c')
-rw-r--r-- | kernel/audit_tree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index 3a5ca582ba1e..69a58515f43f 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c | |||
@@ -259,7 +259,7 @@ static void untag_chunk(struct node *p) | |||
259 | 259 | ||
260 | fsnotify_duplicate_mark(&new->mark, entry); | 260 | fsnotify_duplicate_mark(&new->mark, entry); |
261 | if (fsnotify_add_mark(&new->mark, new->mark.group, new->mark.i.inode, NULL, 1)) { | 261 | if (fsnotify_add_mark(&new->mark, new->mark.group, new->mark.i.inode, NULL, 1)) { |
262 | free_chunk(new); | 262 | fsnotify_put_mark(&new->mark); |
263 | goto Fallback; | 263 | goto Fallback; |
264 | } | 264 | } |
265 | 265 | ||
@@ -322,7 +322,7 @@ static int create_chunk(struct inode *inode, struct audit_tree *tree) | |||
322 | 322 | ||
323 | entry = &chunk->mark; | 323 | entry = &chunk->mark; |
324 | if (fsnotify_add_mark(entry, audit_tree_group, inode, NULL, 0)) { | 324 | if (fsnotify_add_mark(entry, audit_tree_group, inode, NULL, 0)) { |
325 | free_chunk(chunk); | 325 | fsnotify_put_mark(entry); |
326 | return -ENOSPC; | 326 | return -ENOSPC; |
327 | } | 327 | } |
328 | 328 | ||
@@ -396,7 +396,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree) | |||
396 | fsnotify_duplicate_mark(chunk_entry, old_entry); | 396 | fsnotify_duplicate_mark(chunk_entry, old_entry); |
397 | if (fsnotify_add_mark(chunk_entry, chunk_entry->group, chunk_entry->i.inode, NULL, 1)) { | 397 | if (fsnotify_add_mark(chunk_entry, chunk_entry->group, chunk_entry->i.inode, NULL, 1)) { |
398 | spin_unlock(&old_entry->lock); | 398 | spin_unlock(&old_entry->lock); |
399 | free_chunk(chunk); | 399 | fsnotify_put_mark(chunk_entry); |
400 | fsnotify_put_mark(old_entry); | 400 | fsnotify_put_mark(old_entry); |
401 | return -ENOSPC; | 401 | return -ENOSPC; |
402 | } | 402 | } |