On Mon, Mar 31, 2014 at 06:14:18PM +0400, Andrey Vagin wrote: > nf_ct_gre_keymap_flush() removes a nf_ct_gre_keymap object from > net_gre->keymap_list and frees the object. But it doesn't clean > a reference on this object from ct_pptp_info->keymap[dir]. > Then nf_ct_gre_keymap_destroy() may release the same object again. > > So nf_ct_gre_keymap_flush() can be called only when we are sure that > when nf_ct_gre_keymap_destroy will not be called. > > nf_ct_gre_keymap is created by nf_ct_gre_keymap_add() and the right way > to destroy it is to call nf_ct_gre_keymap_destroy(). I think you use call nf_ct_iterate_cleanup() to get rid of all GRE conntrack entries that have a ct->master, which means that they were created by PPTP. That implicitly calls gre_destroy, which releases the keymap object. > This patch marks nf_ct_gre_keymap_flush() as static, so this patch can > break compilation of third party modules, which use > nf_ct_gre_keymap_flush. I'm not sure this is the right way to deprecate > this function. No problem with that, we don't mind about out of tree modules. With the approach I'm proposing I think you will also need to make this function static as it won't be used by PPTP anymore. -- To unsubscribe from this list: send the line "unsubscribe netfilter" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
