diff --git a/[refs] b/[refs]
index 6ce178699b7b..c477ba3713da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70e76b768bac81149c8c189e781c3f130ea2eba5
+refs/heads/master: 3f5af5b353ca36aca4f8a46e3da2172f669dbbbc
diff --git a/trunk/net/ipv4/ipvs/ip_vs_ftp.c b/trunk/net/ipv4/ipvs/ip_vs_ftp.c
index 347a66c05569..f0c553c038de 100644
--- a/trunk/net/ipv4/ipvs/ip_vs_ftp.c
+++ b/trunk/net/ipv4/ipvs/ip_vs_ftp.c
@@ -373,6 +373,12 @@ static int __init ip_vs_ftp_init(void)
 	for (i=0; i<IP_VS_APP_MAX_PORTS; i++) {
 		if (!ports[i])
 			continue;
+		if (ports[i] < 0 || ports[i] > 0xffff) {
+			IP_VS_WARNING("ip_vs_ftp: Ignoring invalid "
+				      "configuration port[%d] = %d\n",
+				      i, ports[i]);
+			continue;
+		}
 		ret = register_ip_vs_app_inc(app, app->protocol, ports[i]);
 		if (ret)
 			break;