Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-block.git] / net / ipv4 / sysctl_net_ipv4.c

diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 59ded25acd045d90573eb144381df4381ecba837..fcb2cd167f64a52bed2574414780be2d949f5484 100644 (file)
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -340,6 +340,10 @@ static int proc_tcp_fastopen_key(struct ctl_table *table, int write,
                                user_key[i * 4 + 1],
                                user_key[i * 4 + 2],
                                user_key[i * 4 + 3]);
+
+               if (WARN_ON_ONCE(off >= tbl.maxlen - 1))
+                       break;
+
                if (i + 1 < n_keys)
                        off += snprintf(tbl.data + off, tbl.maxlen - off, ",");
        }
@@ -1037,7 +1041,7 @@ static struct ctl_table ipv4_net_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_fib_multipath_hash_policy,
                .extra1         = SYSCTL_ZERO,
-               .extra2         = SYSCTL_ONE,
+               .extra2         = &two,
        },
 #endif
        {