]> err.no Git - linux-2.6/commitdiff
netfilter: nf_conntrack_gre: nf_ct_gre_keymap_flush() fixlet
authorAlexey Dobriyan <adobriyan@gmail.com>
Mon, 8 Sep 2008 01:20:36 +0000 (18:20 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Sep 2008 01:20:36 +0000 (18:20 -0700)
It does "kfree(list_head)" which looks wrong because entity that was
allocated is definitely not list_head.

However, this all works because list_head is first item in
struct nf_ct_gre_keymap.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nf_conntrack_proto_gre.c

index b308bb4c12b9f8e9cc8ec08575a92a836fdf3104..9bd03967fea4b4c66654e5ad1c8f32779a8bc9c2 100644 (file)
@@ -45,12 +45,12 @@ static LIST_HEAD(gre_keymap_list);
 
 void nf_ct_gre_keymap_flush(void)
 {
-       struct list_head *pos, *n;
+       struct nf_ct_gre_keymap *km, *tmp;
 
        write_lock_bh(&nf_ct_gre_lock);
-       list_for_each_safe(pos, n, &gre_keymap_list) {
-               list_del(pos);
-               kfree(pos);
+       list_for_each_entry_safe(km, tmp, &gre_keymap_list, list) {
+               list_del(&km->list);
+               kfree(km);
        }
        write_unlock_bh(&nf_ct_gre_lock);
 }