diff options
| author | Simon Horman <horms@verge.net.au> | 2013-05-30 16:39:29 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-31 16:38:25 -0700 |
| commit | 938177e9f3e0238c1712210f7bb6def38a5c8d7f (patch) | |
| tree | 74a40a22f9090d7ac1dfcf96fda3486e41cc8eea /net/netfilter | |
| parent | db8caf3dbc77599dc90f4ea0a803cd1d97116f30 (diff) | |
| download | kernel_goldelico_gta04-938177e9f3e0238c1712210f7bb6def38a5c8d7f.zip kernel_goldelico_gta04-938177e9f3e0238c1712210f7bb6def38a5c8d7f.tar.gz kernel_goldelico_gta04-938177e9f3e0238c1712210f7bb6def38a5c8d7f.tar.bz2 | |
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: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_nat_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_nat_helper.c b/net/netfilter/nf_nat_helper.c index 5fea563..85e20a9 100644 --- a/net/netfilter/nf_nat_helper.c +++ b/net/netfilter/nf_nat_helper.c @@ -104,7 +104,7 @@ static void mangle_contents(struct sk_buff *skb, /* move post-replacement */ memmove(data + match_offset + rep_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)); /* insert data from buffer */ |