X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=net%2Fnetfilter%2Fipvs%2Fip_vs_ftp.c;h=510f2b5a5855bc8040f2a50ed14ed1a7ae335500;hb=0d6c4a2e4641bbc556dd74d3aa158c413a972492;hp=538d74ee4f68bc18e7bb379d7432388aba305425;hpb=c28800a9c3caaf387d85ac665a25ebe99e480295;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
index 538d74ee4f68..510f2b5a5855 100644
--- a/net/netfilter/ipvs/ip_vs_ftp.c
+++ b/net/netfilter/ipvs/ip_vs_ftp.c
@@ -177,7 +177,7 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
 	__be16 port;
 	struct ip_vs_conn *n_cp;
 	char buf[24];		/* xxx.xxx.xxx.xxx,ppp,ppp\000 */
-	unsigned buf_len;
+	unsigned int buf_len;
 	int ret = 0;
 	enum ip_conntrack_info ctinfo;
 	struct nf_conn *ct;
@@ -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;