浏览代码

kernel/auditfilter.c: fix leak in audit_add_rule() error path

If both 'tree' and 'watch' are valid we must call audit_put_tree(), just
like the preceding code within audit_add_rule().

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Eric Paris <eparis@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Chen Gang 12 年之前
父节点
当前提交
2f992ee85a
共有 1 个文件被更改,包括 6 次插入0 次删除
  1. 6 0
      kernel/auditfilter.c

+ 6 - 0
kernel/auditfilter.c

@@ -865,6 +865,12 @@ static inline int audit_add_rule(struct audit_entry *entry)
 		err = audit_add_watch(&entry->rule, &list);
 		err = audit_add_watch(&entry->rule, &list);
 		if (err) {
 		if (err) {
 			mutex_unlock(&audit_filter_mutex);
 			mutex_unlock(&audit_filter_mutex);
+			/*
+			 * normally audit_add_tree_rule() will free it
+			 * on failure
+			 */
+			if (tree)
+				audit_put_tree(tree);
 			goto error;
 			goto error;
 		}
 		}
 	}
 	}