net, ipv4, ipv6: Correct assignment of skb->network_header to skb->tail

Browse source

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 however skb->network_header is now
an offset.

This patch corrects the problem by adding a wrapper to return skb tail as
an offset regardless of the value of NET_SKBUFF_DATA_USES_OFFSET. It seems
that skb->tail that this offset may be more than 64k and some care has been
taken to treat such cases as an error.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

Simon Horman 2013-05-28 20:34:29 +00:00 • committed by David S. Miller

parent 158874cac6

commit 7cc4619005

4 changed files with 38 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

include/linux/skbuff.h

View file

9

net/core/netpoll.c

View file

16

net/core/pktgen.c

View file

8

net/ipv4/ipmr.c

View file