diff options
author | Sven Wegener <sven.wegener@stealer.net> | 2008-08-03 17:06:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-03 17:06:44 -0400 |
commit | adf044c8778de98dae29c5ce9973b7e43964674f (patch) | |
tree | aca4e834cf1a9d15d348f9c23905dcf9f443ca85 /net/ipv4/sysctl_net_ipv4.c | |
parent | e5a4a72d4f88f4389e9340d383ca67031d1b8536 (diff) |
net: Add missing extra2 parameter for ip_default_ttl sysctl
Commit 76e6ebfb40a2455c18234dcb0f9df37533215461 ("netns: add namespace
parameter to rt_cache_flush") acceses the extra2 parameter of the
ip_default_ttl ctl_table, but it is never set to a meaningful
value. When e84f84f276473dcc673f360e8ff3203148bdf0e2 ("netns: place
rt_genid into struct net") is applied, we'll oops in
rt_cache_invalidate(). Set extra2 to init_net, to avoid that.
Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
Tested-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Acked-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
-rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 770d827f5ab8..e0689fd7b798 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c | |||
@@ -232,6 +232,7 @@ static struct ctl_table ipv4_table[] = { | |||
232 | .mode = 0644, | 232 | .mode = 0644, |
233 | .proc_handler = &ipv4_doint_and_flush, | 233 | .proc_handler = &ipv4_doint_and_flush, |
234 | .strategy = &ipv4_doint_and_flush_strategy, | 234 | .strategy = &ipv4_doint_and_flush_strategy, |
235 | .extra2 = &init_net, | ||
235 | }, | 236 | }, |
236 | { | 237 | { |
237 | .ctl_name = NET_IPV4_NO_PMTU_DISC, | 238 | .ctl_name = NET_IPV4_NO_PMTU_DISC, |