leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: nat: remove duplicate skb_is_nonlinear() in __nf_nat_mangle_tcp_packet()

Browse Source 
__nf_nat_mangle_tcp_packet() and nf_nat_mangle_udp_packet() call
mangle_contents(). and __nf_nat_mangle_tcp_packet()
and mangle_contents() call skb_is_nonlinear(). so that
skb_is_nonlinear() in __nf_nat_mangle_tcp_packet() is unnecessary.

Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Taehee Yoo 2018-09-12 23:07:31 +09:00 committed by Pablo Neira Ayuso
parent 93185c80a5
commit f8b0a3ab06
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/netfilter/nf_nat_helper.c
View File

@ -37,7 +37,7 @@ static void mangle_contents(struct sk_buff *skb,
{ {
unsigned char *data; unsigned char *data;
BUG_ON(skb_is_nonlinear(skb)); SKB_LINEAR_ASSERT(skb);
data = skb_network_header(skb) + dataoff; data = skb_network_header(skb) + dataoff;
/* move post-replacement */ /* move post-replacement */
@ -110,8 +110,6 @@ bool __nf_nat_mangle_tcp_packet(struct sk_buff *skb,
!enlarge_skb(skb, rep_len - match_len)) !enlarge_skb(skb, rep_len - match_len))
return false; return false;
SKB_LINEAR_ASSERT(skb);
tcph = (void *)skb->data + protoff; tcph = (void *)skb->data + protoff;
oldlen = skb->len - protoff; oldlen = skb->len - protoff;