提交 639e104f 编写于 作者: D Denis V. Lunev 提交者: David S. Miller

ipv4: remove static flush_delay variable

flush delay is used as an external storage for net.ipv4.route.flush sysctl
entry. It is write-only.

The ctl_table->data for this entry is used once. Fix this case to point
to the stack to remove global variable. Do this to avoid additional
variable on struct net in the next patch.

Possible race (as it was before) accessing this local variable is removed
using flush_mutex.
Signed-off-by: NDenis V. Lunev <den@openvz.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 ae299fc0
......@@ -2829,14 +2829,20 @@ void ip_rt_multicast_event(struct in_device *in_dev)
}
#ifdef CONFIG_SYSCTL
static int flush_delay;
static int ipv4_sysctl_rtcache_flush(ctl_table *ctl, int write,
struct file *filp, void __user *buffer,
size_t *lenp, loff_t *ppos)
{
if (write) {
int flush_delay;
static DEFINE_MUTEX(flush_mutex);
mutex_lock(&flush_mutex);
ctl->data = &flush_delay;
proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
ctl->data = NULL;
mutex_unlock(&flush_mutex);
rt_cache_flush(&init_net, flush_delay);
return 0;
}
......@@ -2865,7 +2871,6 @@ ctl_table ipv4_route_table[] = {
{
.ctl_name = NET_IPV4_ROUTE_FLUSH,
.procname = "flush",
.data = &flush_delay,
.maxlen = sizeof(int),
.mode = 0200,
.proc_handler = &ipv4_sysctl_rtcache_flush,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册