adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-26 18:56:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix more leaks in audit_tree.c tag_chunk()

Browse source 
Several leaks in audit_tree didn't get caught by commit
318b6d3d7d, including the leak on normal
exit in case of multiple rules refering to the same chunk.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2009-12-19 16:03:30 +00:00 committed by Linus Torvalds
parent 6f5d511489
commit b4c30aad39
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
kernel/audit_tree.c
View file

@ -373,15 +373,17 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
for (n = 0; n < old->count; n++) { for (n = 0; n < old->count; n++) {
if (old->owners[n].owner == tree) { if (old->owners[n].owner == tree) {
spin_unlock(&hash_lock); spin_unlock(&hash_lock);
put_inotify_watch(watch); put_inotify_watch(&old->watch);
return 0; return 0;
} }
} }
spin_unlock(&hash_lock); spin_unlock(&hash_lock);
chunk = alloc_chunk(old->count + 1); chunk = alloc_chunk(old->count + 1);
if (!chunk) if (!chunk) {
put_inotify_watch(&old->watch);
return -ENOMEM; return -ENOMEM;
}
mutex_lock(&inode->inotify_mutex); mutex_lock(&inode->inotify_mutex);
if (inotify_clone_watch(&old->watch, &chunk->watch) < 0) { if (inotify_clone_watch(&old->watch, &chunk->watch) < 0) {
@ -425,7 +427,8 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
spin_unlock(&hash_lock); spin_unlock(&hash_lock);
inotify_evict_watch(&old->watch); inotify_evict_watch(&old->watch);
mutex_unlock(&inode->inotify_mutex); mutex_unlock(&inode->inotify_mutex);
put_inotify_watch(&old->watch); put_inotify_watch(&old->watch); /* pair to inotify_find_watch */
put_inotify_watch(&old->watch); /* and kill it */
return 0; return 0;
} }