audit: Use list_move instead of list_del/list_add
authorBaokun Li <libaokun1@huawei.com>
Tue, 8 Jun 2021 03:11:50 +0000 (11:11 +0800)
committerPaul Moore <paul@paul-moore.com>
Wed, 9 Jun 2021 02:18:35 +0000 (22:18 -0400)
Using list_move() instead of list_del() + list_add().

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Baokun Li <libaokun1@huawei.com>
Acked-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
kernel/audit_tree.c

index 6c91902f4f455a0d83257883712d89b5f7a91f15..b2be4e978ba3e3de709627b42f79b0fe12db08ef 100644 (file)
@@ -689,8 +689,7 @@ void audit_trim_trees(void)
 
                tree = container_of(cursor.next, struct audit_tree, list);
                get_tree(tree);
-               list_del(&cursor);
-               list_add(&cursor, &tree->list);
+               list_move(&cursor, &tree->list);
                mutex_unlock(&audit_filter_mutex);
 
                err = kern_path(tree->pathname, 0, &path);
@@ -899,8 +898,7 @@ int audit_tag_tree(char *old, char *new)
 
                tree = container_of(cursor.next, struct audit_tree, list);
                get_tree(tree);
-               list_del(&cursor);
-               list_add(&cursor, &tree->list);
+               list_move(&cursor, &tree->list);
                mutex_unlock(&audit_filter_mutex);
 
                err = kern_path(tree->pathname, 0, &path2);
@@ -925,8 +923,7 @@ int audit_tag_tree(char *old, char *new)
                mutex_lock(&audit_filter_mutex);
                spin_lock(&hash_lock);
                if (!tree->goner) {
-                       list_del(&tree->list);
-                       list_add(&tree->list, &tree_list);
+                       list_move(&tree->list, &tree_list);
                }
                spin_unlock(&hash_lock);
                put_tree(tree);
@@ -937,8 +934,7 @@ int audit_tag_tree(char *old, char *new)
 
                tree = container_of(barrier.prev, struct audit_tree, list);
                get_tree(tree);
-               list_del(&tree->list);
-               list_add(&tree->list, &barrier);
+               list_move(&tree->list, &barrier);
                mutex_unlock(&audit_filter_mutex);
 
                if (!failed) {