[PATCH 2.6.10]: Fix memory leak in ip_conntrack_ftp

[Patrick McHardy <kaber@trash.net>]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

Hi Dave,

this patch fixes a remotely triggerable memory leak in ip_conntrack_ftp.
exp leaks when a FTP date connection to a host different from the client
(FXP) is attempted and the loose option is not set. It should go in
2.6.10 in my opinion.

Regards
Patrick


[-- Attachment #2: x --]
[-- Type: text/plain, Size: 888 bytes --]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/12/08 02:00:45+01:00 kaber@coreworks.de 
#   [NETFILTER]: Fix memory leak in ip_conntrack_ftp
#   
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
# net/ipv4/netfilter/ip_conntrack_ftp.c
#   2004/12/08 02:00:39+01:00 kaber@coreworks.de +1 -0
#   [NETFILTER]: Fix memory leak in ip_conntrack_ftp
#   
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
diff -Nru a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c
--- a/net/ipv4/netfilter/ip_conntrack_ftp.c	2004-12-08 22:22:37 +01:00
+++ b/net/ipv4/netfilter/ip_conntrack_ftp.c	2004-12-08 22:22:37 +01:00
@@ -381,6 +381,7 @@
 		   problem (DMZ machines opening holes to internal
 		   networks, or the packet filter itself). */
 		if (!loose) {
+			ip_conntrack_expect_put(exp);
 			ret = NF_ACCEPT;
 			goto out;
 		}