summaryrefslogtreecommitdiffstats
path: root/net/ipv6/icmp.c
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2013-05-28 22:34:26 +0200
committerDavid S. Miller <davem@davemloft.net>2013-05-29 08:49:07 +0200
commit29a3cad5c6ae9e7fbf1509d01d39c3c3c38f11f9 (patch)
treefd6436d8a820801843ca257807c8af0f36425291 /net/ipv6/icmp.c
parentnet: Correct comparisons and calculations using skb->tail and skb-transport_h... (diff)
downloadlinux-29a3cad5c6ae9e7fbf1509d01d39c3c3c38f11f9.tar.xz
linux-29a3cad5c6ae9e7fbf1509d01d39c3c3c38f11f9.zip
ipv6: Correct comparisons and calculations using skb->tail and skb-transport_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->transport_header will be an offset from head. This is corrected by using wrappers that ensure that comparisons and calculations are always made using pointers. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/icmp.c')
-rw-r--r--net/ipv6/icmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 1d2902e61786..4b4890bbe16d 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -399,7 +399,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)
int err = 0;
if ((u8 *)hdr < skb->head ||
- (skb->network_header + sizeof(*hdr)) > skb->tail)
+ (skb_network_header(skb) + sizeof(*hdr)) > skb_tail_pointer(skb))
return;
/*