Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
a802e299
Commit
a802e299
authored
21 years ago
by
Stephen Hemminger
Committed by
David S. Miller
21 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[NET]: More synchronize_net call sites.
parent
3c37a0b9
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
20 deletions
+7
-20
net/ipv4/netfilter/ip_conntrack_core.c
net/ipv4/netfilter/ip_conntrack_core.c
+2
-5
net/ipv4/netfilter/ip_conntrack_standalone.c
net/ipv4/netfilter/ip_conntrack_standalone.c
+1
-3
net/ipv4/netfilter/ip_nat_helper.c
net/ipv4/netfilter/ip_nat_helper.c
+1
-3
net/ipv4/netfilter/ip_nat_snmp_basic.c
net/ipv4/netfilter/ip_nat_snmp_basic.c
+1
-3
net/ipv4/netfilter/ip_nat_standalone.c
net/ipv4/netfilter/ip_nat_standalone.c
+1
-3
net/ipv4/netfilter/ip_queue.c
net/ipv4/netfilter/ip_queue.c
+1
-3
No files found.
net/ipv4/netfilter/ip_conntrack_core.c
View file @
a802e299
...
...
@@ -24,7 +24,6 @@
#include <linux/skbuff.h>
#include <linux/proc_fs.h>
#include <linux/vmalloc.h>
#include <linux/brlock.h>
#include <net/checksum.h>
#include <linux/stddef.h>
#include <linux/sysctl.h>
...
...
@@ -1160,8 +1159,7 @@ void ip_conntrack_helper_unregister(struct ip_conntrack_helper *me)
WRITE_UNLOCK
(
&
ip_conntrack_lock
);
/* Someone could be still looking at the helper in a bh. */
br_write_lock_bh
(
BR_NETPROTO_LOCK
);
br_write_unlock_bh
(
BR_NETPROTO_LOCK
);
synchronize_net
();
}
/* Refresh conntrack for this many jiffies. */
...
...
@@ -1401,8 +1399,7 @@ void ip_conntrack_cleanup(void)
/* This makes sure all current packets have passed through
netfilter framework. Roll on, two-stage module
delete... */
br_write_lock_bh
(
BR_NETPROTO_LOCK
);
br_write_unlock_bh
(
BR_NETPROTO_LOCK
);
synchronize_net
();
i_see_dead_people:
ip_ct_selective_cleanup
(
kill_all
,
NULL
);
...
...
This diff is collapsed.
Click to expand it.
net/ipv4/netfilter/ip_conntrack_standalone.c
View file @
a802e299
...
...
@@ -15,7 +15,6 @@
#include <linux/skbuff.h>
#include <linux/proc_fs.h>
#include <linux/version.h>
#include <linux/brlock.h>
#include <net/checksum.h>
#define ASSERT_READ_LOCK(x) MUST_BE_READ_LOCKED(&ip_conntrack_lock)
...
...
@@ -342,8 +341,7 @@ void ip_conntrack_protocol_unregister(struct ip_conntrack_protocol *proto)
WRITE_UNLOCK
(
&
ip_conntrack_lock
);
/* Somebody could be still looking at the proto in bh. */
br_write_lock_bh
(
BR_NETPROTO_LOCK
);
br_write_unlock_bh
(
BR_NETPROTO_LOCK
);
synchronize_net
();
/* Remove all contrack entries for this protocol */
ip_ct_selective_cleanup
(
kill_proto
,
&
proto
->
proto
);
...
...
This diff is collapsed.
Click to expand it.
net/ipv4/netfilter/ip_nat_helper.c
View file @
a802e299
...
...
@@ -20,7 +20,6 @@
#include <linux/timer.h>
#include <linux/skbuff.h>
#include <linux/netfilter_ipv4.h>
#include <linux/brlock.h>
#include <net/checksum.h>
#include <net/icmp.h>
#include <net/ip.h>
...
...
@@ -545,8 +544,7 @@ void ip_nat_helper_unregister(struct ip_nat_helper *me)
WRITE_UNLOCK
(
&
ip_nat_lock
);
/* Someone could be still looking at the helper in a bh. */
br_write_lock_bh
(
BR_NETPROTO_LOCK
);
br_write_unlock_bh
(
BR_NETPROTO_LOCK
);
synchronize_net
();
/* Find anything using it, and umm, kill them. We can't turn
them into normal connections: if we've adjusted SYNs, then
...
...
This diff is collapsed.
Click to expand it.
net/ipv4/netfilter/ip_nat_snmp_basic.c
View file @
a802e299
...
...
@@ -50,7 +50,6 @@
#include <linux/netfilter_ipv4.h>
#include <linux/netfilter_ipv4/ip_nat.h>
#include <linux/netfilter_ipv4/ip_nat_helper.h>
#include <linux/brlock.h>
#include <linux/types.h>
#include <linux/ip.h>
#include <net/udp.h>
...
...
@@ -1351,8 +1350,7 @@ static void __exit fini(void)
{
ip_nat_helper_unregister
(
&
snmp
);
ip_nat_helper_unregister
(
&
snmp_trap
);
br_write_lock_bh
(
BR_NETPROTO_LOCK
);
br_write_unlock_bh
(
BR_NETPROTO_LOCK
);
synchronize_net
();
}
module_init
(
init
);
...
...
This diff is collapsed.
Click to expand it.
net/ipv4/netfilter/ip_nat_standalone.c
View file @
a802e299
...
...
@@ -24,7 +24,6 @@
#include <net/checksum.h>
#include <linux/spinlock.h>
#include <linux/version.h>
#include <linux/brlock.h>
#define ASSERT_READ_LOCK(x) MUST_BE_READ_LOCKED(&ip_nat_lock)
#define ASSERT_WRITE_LOCK(x) MUST_BE_WRITE_LOCKED(&ip_nat_lock)
...
...
@@ -286,8 +285,7 @@ void ip_nat_protocol_unregister(struct ip_nat_protocol *proto)
WRITE_UNLOCK
(
&
ip_nat_lock
);
/* Someone could be still looking at the proto in a bh. */
br_write_lock_bh
(
BR_NETPROTO_LOCK
);
br_write_unlock_bh
(
BR_NETPROTO_LOCK
);
synchronize_net
();
}
static
int
init_or_cleanup
(
int
init
)
...
...
This diff is collapsed.
Click to expand it.
net/ipv4/netfilter/ip_queue.c
View file @
a802e299
...
...
@@ -23,7 +23,6 @@
#include <linux/netfilter_ipv4/ip_tables.h>
#include <linux/netlink.h>
#include <linux/spinlock.h>
#include <linux/brlock.h>
#include <linux/sysctl.h>
#include <linux/proc_fs.h>
#include <linux/security.h>
...
...
@@ -679,8 +678,7 @@ init_or_cleanup(int init)
cleanup:
nf_unregister_queue_handler
(
PF_INET
);
br_write_lock_bh
(
BR_NETPROTO_LOCK
);
br_write_unlock_bh
(
BR_NETPROTO_LOCK
);
synchronize_net
();
ipq_flush
(
NF_DROP
);
cleanup_sysctl:
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment