Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3750618pxj; Mon, 7 Jun 2021 20:07:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzULC4rsiDNZ9a0rvNxejWs/DxHtvbYWKEO+j8VFWSZCmXTWEtaAYcMWvEhWuvr5yBzxrOL X-Received: by 2002:a17:906:24d8:: with SMTP id f24mr21803769ejb.188.1623121619808; Mon, 07 Jun 2021 20:06:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623121619; cv=none; d=google.com; s=arc-20160816; b=JH9KweDWud+V2pQxc8Rlk2+FsKJoPc2Tso3zREBe+RCrX/Zr77mB061dzvh6bvHWNS iaZxpG1qW7njIjpxc1Say5UV80kiyJT5MRTwMFSBr1HP+nuJacsypYHrqdRAqlq178s3 VbwXTaBr5Zmj0+Cl4ZhFraMLrKtV1U7p/3AZcDscQ4yaIQYPSXOotXaxl+yf10Gfg7Ba jjs0FS/2U524/KV6yYsUWuM7Ksa4ZHH3YhXLEgdxk0042C+Eisk96+KnGF1jlyD1j+4L JQDuYhKguLeSUDLuOYvPIIAmmdVDzYe39qruyoEzKQ1jhyCKC93CuWe+B6+DSQzKapPo XG4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=aPCrLjA5mVS2ibNhz/ucka/tQ7LK/3QDKygEhIFFy14=; b=UOisD0CRleuTlkbhwPPjtAlGHLT/jOBhmLGEEijRW3qnrjffGdxZbre58/FiNLadBk Z7SMLeB4HMwxVV/WQTuPz2rF8LZ1Wdevo3fGBRM7U00xPR49X93LRTCJVmdqPGppBUxU 2UOxxn7QELG6ul2OiPilXnNFvDYYTJ353G1dGQdxjjK0qrOb1IPDdaJqCIaxnXp9zOQq 3vPXDCQvky2yK0H2eX+ww2NnBwmabiMS42tnsHbO7cDOOKIvbHIDwNaabz2/ujh4UGoc FJT3IK7kf5hY58QnqsAEoeDOJfn8Aljs2uNkXj/FwdYi5cOHQ1839r6n3IwC8OoeZ/pT C4yQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i13si13729511edc.250.2021.06.07.20.06.36; Mon, 07 Jun 2021 20:06:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231503AbhFHDEf (ORCPT + 99 others); Mon, 7 Jun 2021 23:04:35 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:3094 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230356AbhFHDEe (ORCPT ); Mon, 7 Jun 2021 23:04:34 -0400 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4FzZfk2JFHzWtL4; Tue, 8 Jun 2021 10:57:50 +0800 (CST) Received: from dggpeml500020.china.huawei.com (7.185.36.88) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 8 Jun 2021 11:02:40 +0800 Received: from huawei.com (10.175.127.227) by dggpeml500020.china.huawei.com (7.185.36.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 8 Jun 2021 11:02:39 +0800 From: Baokun Li To: , Paul Moore , "Eric Paris" CC: , , , , , , , Hulk Robot Subject: [PATCH -next] audit: Use list_move instead of list_del/list_add Date: Tue, 8 Jun 2021 11:11:50 +0800 Message-ID: <20210608031150.2821712-1-libaokun1@huawei.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500020.china.huawei.com (7.185.36.88) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Using list_move() instead of list_del() + list_add(). Reported-by: Hulk Robot Signed-off-by: Baokun Li --- kernel/audit_tree.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index 6c91902f4f45..b2be4e978ba3 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c @@ -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) {