diff options
| author | Simon Horman <horms@verge.net.au> | 2013-05-28 20:34:26 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-28 23:49:07 -0700 |
| commit | 29a3cad5c6ae9e7fbf1509d01d39c3c3c38f11f9 (patch) | |
| tree | fd6436d8a820801843ca257807c8af0f36425291 /net/ipv6/raw.c | |
| parent | ced14f6804a979d1972415bc23f2f8ddb18595dd (diff) | |
| download | linux-29a3cad5c6ae9e7fbf1509d01d39c3c3c38f11f9.tar.gz linux-29a3cad5c6ae9e7fbf1509d01d39c3c3c38f11f9.tar.bz2 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/raw.c')
| -rw-r--r-- | net/ipv6/raw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index eedff8ccded5..4f8886aa8429 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -1132,7 +1132,8 @@ static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg) spin_lock_bh(&sk->sk_receive_queue.lock); skb = skb_peek(&sk->sk_receive_queue); if (skb != NULL) - amount = skb->tail - skb->transport_header; + amount = skb_tail_pointer(skb) - + skb_transport_header(skb); spin_unlock_bh(&sk->sk_receive_queue.lock); return put_user(amount, (int __user *)arg); } |