aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2015-07-29 20:21:56 -0700
committerJorge Lucangeli Obes <jorgelo@google.com>2015-12-08 11:26:46 -0800
commit7b0d86188f1f2eb4f555f528d81f1a6f359875d6 (patch)
treec9beb43ea714486bf84cdf41e5d7ad230f86888f
parenta57404624bc37aa5e44f33431d67d4a43c60f8f0 (diff)
downloadedison-v3.10-7b0d86188f1f2eb4f555f528d81f1a6f359875d6.tar.gz
Revert "SELinux: use deletion-safe iterator to free list"
This reverts commit 98a4d82a78914c2496989d669ecae04dedcf361f. Bug: 22846070 Change-Id: Ic047824591e8d94f937c052846ab387864c04fd7 Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
-rw-r--r--security/selinux/avc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index f3dbbc0f15d..5c8e7cfa9de 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -298,15 +298,13 @@ static void avc_operation_decision_free(
static void avc_operation_free(struct avc_operation_node *ops_node)
{
- struct avc_operation_decision_node *od_node, *tmp;
+ struct avc_operation_decision_node *od_node;
if (!ops_node)
return;
- list_for_each_entry_safe(od_node, tmp, &ops_node->od_head, od_list) {
- list_del(&od_node->od_list);
+ list_for_each_entry(od_node, &ops_node->od_head, od_list)
avc_operation_decision_free(od_node);
- }
kmem_cache_free(avc_operation_node_cachep, ops_node);
}