Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
4ada8107
Commit
4ada8107
authored
Mar 17, 2009
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
parents
303c6a02
d1238d53
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
8 deletions
+10
-8
include/net/netfilter/nf_conntrack_core.h
include/net/netfilter/nf_conntrack_core.h
+2
-1
net/ipv6/netfilter/nf_conntrack_reasm.c
net/ipv6/netfilter/nf_conntrack_reasm.c
+4
-4
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_core.c
+1
-1
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_conntrack_netlink.c
+1
-0
net/netfilter/nf_conntrack_proto_tcp.c
net/netfilter/nf_conntrack_proto_tcp.c
+2
-2
No files found.
include/net/netfilter/nf_conntrack_core.h
View file @
4ada8107
...
...
@@ -62,7 +62,8 @@ static inline int nf_conntrack_confirm(struct sk_buff *skb)
if
(
ct
&&
ct
!=
&
nf_conntrack_untracked
)
{
if
(
!
nf_ct_is_confirmed
(
ct
)
&&
!
nf_ct_is_dying
(
ct
))
ret
=
__nf_conntrack_confirm
(
skb
);
nf_ct_deliver_cached_events
(
ct
);
if
(
likely
(
ret
==
NF_ACCEPT
))
nf_ct_deliver_cached_events
(
ct
);
}
return
ret
;
}
...
...
net/ipv6/netfilter/nf_conntrack_reasm.c
View file @
4ada8107
...
...
@@ -528,14 +528,14 @@ find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff)
if
(
!
ipv6_ext_hdr
(
nexthdr
))
{
return
-
1
;
}
if
(
len
<
(
int
)
sizeof
(
struct
ipv6_opt_hdr
))
{
pr_debug
(
"too short
\n
"
);
return
-
1
;
}
if
(
nexthdr
==
NEXTHDR_NONE
)
{
pr_debug
(
"next header is none
\n
"
);
return
-
1
;
}
if
(
len
<
(
int
)
sizeof
(
struct
ipv6_opt_hdr
))
{
pr_debug
(
"too short
\n
"
);
return
-
1
;
}
if
(
skb_copy_bits
(
skb
,
start
,
&
hdr
,
sizeof
(
hdr
)))
BUG
();
if
(
nexthdr
==
NEXTHDR_AUTH
)
...
...
net/netfilter/nf_conntrack_core.c
View file @
4ada8107
...
...
@@ -726,7 +726,7 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,
NF_CT_ASSERT
(
skb
->
nfct
);
ret
=
l4proto
->
packet
(
ct
,
skb
,
dataoff
,
ctinfo
,
pf
,
hooknum
);
if
(
ret
<
0
)
{
if
(
ret
<
=
0
)
{
/* Invalid: inverse of the return code tells
* the netfilter core what to do */
pr_debug
(
"nf_conntrack_in: Can't track with proto module
\n
"
);
...
...
net/netfilter/nf_conntrack_netlink.c
View file @
4ada8107
...
...
@@ -1780,6 +1780,7 @@ ctnetlink_create_expect(struct nlattr *cda[], u_int8_t u3, u32 pid, int report)
goto
out
;
}
exp
->
class
=
0
;
exp
->
expectfn
=
NULL
;
exp
->
flags
=
0
;
exp
->
master
=
ct
;
...
...
net/netfilter/nf_conntrack_proto_tcp.c
View file @
4ada8107
...
...
@@ -859,7 +859,7 @@ static int tcp_packet(struct nf_conn *ct,
*/
if
(
nf_ct_kill
(
ct
))
return
-
NF_REPEAT
;
return
-
NF_DROP
;
return
NF_DROP
;
}
/* Fall through */
case
TCP_CONNTRACK_IGNORE
:
...
...
@@ -892,7 +892,7 @@ static int tcp_packet(struct nf_conn *ct,
nf_log_packet
(
pf
,
0
,
skb
,
NULL
,
NULL
,
NULL
,
"nf_ct_tcp: killing out of sync session "
);
nf_ct_kill
(
ct
);
return
-
NF_DROP
;
return
NF_DROP
;
}
ct
->
proto
.
tcp
.
last_index
=
index
;
ct
->
proto
.
tcp
.
last_dir
=
dir
;
...
...
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