---

yaml --- r: 299954 b: refs/heads/master c: 8d08d71 h: refs/heads/master v: v3
git-mirror · Apr 26, 2012 · 54e3fb4 · 54e3fb4
1 parent d61f924
commit 54e3fb4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;