diff options
| author |   Denis V. Lunev <den@openvz.org> | 2008-03-27 16:55:53 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-03-27 16:55:53 -0700 |
| commit | 8eeee8b152ae6bbe181518efaf62ba8e9c613693 (patch) | |
| tree | b5900762ddf2a5d03ed31da629b726c6fd6a710f /net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | |
| parent | [ESP]: Ensure IV is in linear part of the skb to avoid BUG() due to OOB access (diff) | |
| download | linux-dev-8eeee8b152ae6bbe181518efaf62ba8e9c613693.tar.xz linux-dev-8eeee8b152ae6bbe181518efaf62ba8e9c613693.zip | |
[NETFILTER]: Replate direct proc_fops assignment with proc_create call.
This elliminates infamous race during module loading when one could lookup
proc entry without proc_fops assigned.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c')
| -rw-r--r-- | net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c index 089252e82c01..f500b0fdaef4 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c @@ -395,13 +395,10 @@ int __init nf_conntrack_ipv4_compat_init(void) if (!proc_exp) goto err2; - proc_stat = create_proc_entry("ip_conntrack", S_IRUGO, init_net.proc_net_stat); + proc_stat = proc_create("ip_conntrack", S_IRUGO, + init_net.proc_net_stat, &ct_cpu_seq_fops); if (!proc_stat) goto err3; - - proc_stat->proc_fops = &ct_cpu_seq_fops; - proc_stat->owner = THIS_MODULE; - return 0; err3: |