]> err.no Git - linux-2.6/commit
[NETFILTER]: PPTP conntrack: fix another GRE keymap leak
authorPatrick McHardy <kaber@trash.net>
Wed, 20 Sep 2006 19:11:30 +0000 (12:11 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 22 Sep 2006 22:20:20 +0000 (15:20 -0700)
commit4c5de695cf7f71c85ad8cfff509f6475b8bd4d27
tree5175e20ab9244b4a0961ae98d85c8823956aad77
parentfd5e3befa405ea64d4db6b393b821644bf963c57
[NETFILTER]: PPTP conntrack: fix another GRE keymap leak

When the master PPTP connection times out while still having unfullfilled
expectations (and a GRE keymap entry) associated with it, the keymap entry
is not destroyed.

Add a destroy callback to struct ip_conntrack_helper and use it to destroy
PPTP siblings when the master is destroyed.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/netfilter_ipv4/ip_conntrack_helper.h
net/ipv4/netfilter/ip_conntrack_core.c
net/ipv4/netfilter/ip_conntrack_helper_pptp.c