From 54e3fb46012e023c61f7c2ce4508fff02815db40 Mon Sep 17 00:00:00 2001
From: Julian Anastasov <ja@ssi.bg>
Date: Wed, 25 Apr 2012 00:29:59 +0300
Subject: [PATCH] --- yaml --- r: 299954 b: refs/heads/master c:
 8d08d71ce59438a6ef06be5db07966e0c144b74e h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/net/netfilter/ipvs/ip_vs_ftp.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b0b3656035f3..decb8df18c26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f9b9a2fad47af27e14b037395e03cd8278d96d7
+refs/heads/master: 8d08d71ce59438a6ef06be5db07966e0c144b74e
diff --git a/trunk/net/netfilter/ipvs/ip_vs_ftp.c b/trunk/net/netfilter/ipvs/ip_vs_ftp.c
index 538d74ee4f68..e39f693dd3e4 100644
--- a/trunk/net/netfilter/ipvs/ip_vs_ftp.c
+++ b/trunk/net/netfilter/ipvs/ip_vs_ftp.c
@@ -439,6 +439,8 @@ static int __net_init __ip_vs_ftp_init(struct net *net)
 	struct ip_vs_app *app;
 	struct netns_ipvs *ipvs = net_ipvs(net);
 
+	if (!ipvs)
+		return -ENOENT;
 	app = kmemdup(&ip_vs_ftp, sizeof(struct ip_vs_app), GFP_KERNEL);
 	if (!app)
 		return -ENOMEM;