Commit 938177e9 authored by Simon Horman's avatar Simon Horman Committed by David S. Miller

netfilter: Correct calculation using skb->tail and skb-network_header

This corrects an regression introduced by "net: Use 16bits for *_headers
fields of struct skbuff" when NET_SKBUFF_DATA_USES_OFFSET is not set. In
that case skb->tail will be a pointer whereas skb->network_header
will be an offset from head. This is corrected by using wrappers that
ensure that calculations are always made using pointers.
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Reported-by: default avatarChen Gang <gang.chen@asianux.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db8caf3d
...@@ -104,7 +104,7 @@ static void mangle_contents(struct sk_buff *skb, ...@@ -104,7 +104,7 @@ static void mangle_contents(struct sk_buff *skb,
/* move post-replacement */ /* move post-replacement */
memmove(data + match_offset + rep_len, memmove(data + match_offset + rep_len,
data + match_offset + match_len, data + match_offset + match_len,
skb->tail - (skb->network_header + dataoff + skb_tail_pointer(skb) - (skb_network_header(skb) + dataoff +
match_offset + match_len)); match_offset + match_len));
/* insert data from buffer */ /* insert data from buffer */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment