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
9e10ad0f
Commit
9e10ad0f
authored
Jun 24, 2003
by
Harald Welte
Committed by
David S. Miller
Jun 24, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[NETFILTER]: Fix conntrack master_ct refcounting.
parent
d569594f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
net/ipv4/netfilter/ip_conntrack_core.c
net/ipv4/netfilter/ip_conntrack_core.c
+6
-6
No files found.
net/ipv4/netfilter/ip_conntrack_core.c
View file @
9e10ad0f
...
@@ -305,9 +305,6 @@ destroy_conntrack(struct nf_conntrack *nfct)
...
@@ -305,9 +305,6 @@ destroy_conntrack(struct nf_conntrack *nfct)
IP_NF_ASSERT
(
atomic_read
(
&
nfct
->
use
)
==
0
);
IP_NF_ASSERT
(
atomic_read
(
&
nfct
->
use
)
==
0
);
IP_NF_ASSERT
(
!
timer_pending
(
&
ct
->
timeout
));
IP_NF_ASSERT
(
!
timer_pending
(
&
ct
->
timeout
));
if
(
master_ct
(
ct
))
ip_conntrack_put
(
master_ct
(
ct
));
/* To make sure we don't get any weird locking issues here:
/* To make sure we don't get any weird locking issues here:
* destroy_conntrack() MUST NOT be called with a write lock
* destroy_conntrack() MUST NOT be called with a write lock
* to ip_conntrack_lock!!! -HW */
* to ip_conntrack_lock!!! -HW */
...
@@ -324,9 +321,12 @@ destroy_conntrack(struct nf_conntrack *nfct)
...
@@ -324,9 +321,12 @@ destroy_conntrack(struct nf_conntrack *nfct)
/* Delete our master expectation */
/* Delete our master expectation */
if
(
ct
->
master
)
{
if
(
ct
->
master
)
{
if
(
ct
->
master
->
expectant
)
{
/* can't call __unexpect_related here,
/* can't call __unexpect_related here,
* since it would screw up expect_list */
* since it would screw up expect_list */
list_del
(
&
ct
->
master
->
expected_list
);
list_del
(
&
ct
->
master
->
expected_list
);
ip_conntrack_put
(
ct
->
master
->
expectant
);
}
kfree
(
ct
->
master
);
kfree
(
ct
->
master
);
}
}
WRITE_UNLOCK
(
&
ip_conntrack_lock
);
WRITE_UNLOCK
(
&
ip_conntrack_lock
);
...
...
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