lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1383788572-25938-5-git-send-email-cody@linux.vnet.ibm.com> Date: Wed, 6 Nov 2013 17:42:33 -0800 From: Cody P Schafer <cody@...ux.vnet.ibm.com> To: Andrew Morton <akpm@...ux-foundation.org>, EXT4 <linux-ext4@...r.kernel.org>, Jan Kara <jack@...e.cz>, rostedt@...dmis.org, "David S. Miller" <davem@...emloft.net>, Florian Westphal <fw@...len.de>, Jozsef Kadlecsik <kadlec@...ckhole.kfki.hu>, Pablo Neira Ayuso <pablo@...filter.org>, YOSHIFUJI Hideaki <yoshfuji@...ux-ipv6.org> Cc: LKML <linux-kernel@...r.kernel.org>, Cody P Schafer <cody@...ux.vnet.ibm.com>, coreteam@...filter.org, netdev@...r.kernel.org, netfilter-devel@...r.kernel.org, netfilter@...r.kernel.org, Patrick McHardy <kaber@...sh.net> Subject: [PATCH v2 04/11] net ipset: use rbtree postorder iteration instead of opencoding Use rbtree_postorder_for_each_entry_safe() to destroy the rbtree instead of opencoding an alternate postorder iteration that modifies the tree Signed-off-by: Cody P Schafer <cody@...ux.vnet.ibm.com> --- net/netfilter/ipset/ip_set_hash_netiface.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/net/netfilter/ipset/ip_set_hash_netiface.c b/net/netfilter/ipset/ip_set_hash_netiface.c index 7d798d5..99dba4c 100644 --- a/net/netfilter/ipset/ip_set_hash_netiface.c +++ b/net/netfilter/ipset/ip_set_hash_netiface.c @@ -45,31 +45,12 @@ struct iface_node { static void rbtree_destroy(struct rb_root *root) { - struct rb_node *p, *n = root->rb_node; - struct iface_node *node; - - /* Non-recursive destroy, like in ext3 */ - while (n) { - if (n->rb_left) { - n = n->rb_left; - continue; - } - if (n->rb_right) { - n = n->rb_right; - continue; - } - p = rb_parent(n); - node = rb_entry(n, struct iface_node, node); - if (!p) - *root = RB_ROOT; - else if (p->rb_left == n) - p->rb_left = NULL; - else if (p->rb_right == n) - p->rb_right = NULL; + struct iface_node *node, *next; + rbtree_postorder_for_each_entry_safe(node, next, root, node) kfree(node); - n = p; - } + + *root = RB_ROOT; } static int -- 1.8.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists