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
nexedi
linux
Commits
c828efd5
Commit
c828efd5
authored
Jul 25, 2003
by
Patrick McHardy
Committed by
David S. Miller
Jul 25, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[NETFILTER]: Drop reference to conntrack after removing confirmed expectation.
parent
f2c06f04
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
net/ipv4/netfilter/ip_conntrack_core.c
net/ipv4/netfilter/ip_conntrack_core.c
+8
-5
No files found.
net/ipv4/netfilter/ip_conntrack_core.c
View file @
c828efd5
...
@@ -251,7 +251,7 @@ static void unexpect_related(struct ip_conntrack_expect *expect)
...
@@ -251,7 +251,7 @@ static void unexpect_related(struct ip_conntrack_expect *expect)
}
}
/* delete all unconfirmed expectations for this conntrack */
/* delete all unconfirmed expectations for this conntrack */
static
void
remove_expectations
(
struct
ip_conntrack
*
ct
)
static
void
remove_expectations
(
struct
ip_conntrack
*
ct
,
int
drop_refcount
)
{
{
struct
list_head
*
exp_entry
,
*
next
;
struct
list_head
*
exp_entry
,
*
next
;
struct
ip_conntrack_expect
*
exp
;
struct
ip_conntrack_expect
*
exp
;
...
@@ -266,8 +266,11 @@ static void remove_expectations(struct ip_conntrack *ct)
...
@@ -266,8 +266,11 @@ static void remove_expectations(struct ip_conntrack *ct)
* the un-established ones only */
* the un-established ones only */
if
(
exp
->
sibling
)
{
if
(
exp
->
sibling
)
{
DEBUGP
(
"remove_expectations: skipping established %p of %p
\n
"
,
exp
->
sibling
,
ct
);
DEBUGP
(
"remove_expectations: skipping established %p of %p
\n
"
,
exp
->
sibling
,
ct
);
/* Indicate that this expectations parent is dead */
if
(
drop_refcount
)
{
exp
->
expectant
=
NULL
;
/* Indicate that this expectations parent is dead */
ip_conntrack_put
(
exp
->
expectant
);
exp
->
expectant
=
NULL
;
}
continue
;
continue
;
}
}
...
@@ -292,7 +295,7 @@ clean_from_lists(struct ip_conntrack *ct)
...
@@ -292,7 +295,7 @@ clean_from_lists(struct ip_conntrack *ct)
&
ct
->
tuplehash
[
IP_CT_DIR_REPLY
]);
&
ct
->
tuplehash
[
IP_CT_DIR_REPLY
]);
/* Destroy all un-established, pending expectations */
/* Destroy all un-established, pending expectations */
remove_expectations
(
ct
);
remove_expectations
(
ct
,
1
);
}
}
static
void
static
void
...
@@ -1117,7 +1120,7 @@ static inline int unhelp(struct ip_conntrack_tuple_hash *i,
...
@@ -1117,7 +1120,7 @@ static inline int unhelp(struct ip_conntrack_tuple_hash *i,
{
{
if
(
i
->
ctrack
->
helper
==
me
)
{
if
(
i
->
ctrack
->
helper
==
me
)
{
/* Get rid of any expected. */
/* Get rid of any expected. */
remove_expectations
(
i
->
ctrack
);
remove_expectations
(
i
->
ctrack
,
0
);
/* And *then* set helper to NULL */
/* And *then* set helper to NULL */
i
->
ctrack
->
helper
=
NULL
;
i
->
ctrack
->
helper
=
NULL
;
}
}
...
...
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