diff options
| author |   Simon Vincent <simon.vincent@xsilon.com> | 2014-11-04 15:29:51 +0000 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2014-11-04 17:31:01 +0100 |
| commit | 980edbd503dc0823c75e138edc53a48f99e1e3f6 (patch) | |
| tree | f5e93b5623f6453fa4cde8e130c3c1b4a65bfeb5 /net/6lowpan | |
| parent | Bluetooth: Fix sparse warnings in RFCOMM (diff) | |
| download | linux-dev-980edbd503dc0823c75e138edc53a48f99e1e3f6.tar.xz linux-dev-980edbd503dc0823c75e138edc53a48f99e1e3f6.zip | |
6lowpan: fix udp header compression when using raw sockets
If you use RAW sockets the transport header offset is not set by the
ipv6 stack so when we get to the udp header compression it does not
compress the right part of the packet.
This patch adds a check for this scenario and sets the transport
header offset.
Signed-off-by: Simon Vincent <simon.vincent@xsilon.com>
Acked-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/6lowpan')
| -rw-r--r-- | net/6lowpan/iphc.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/6lowpan/iphc.c b/net/6lowpan/iphc.c index 73a7065f0c6b..cd5f8b8e34cd 100644 --- a/net/6lowpan/iphc.c +++ b/net/6lowpan/iphc.c @@ -512,9 +512,17 @@ static u8 lowpan_compress_addr_64(u8 **hc_ptr, u8 shift, static void compress_udp_header(u8 **hc_ptr, struct sk_buff *skb) { - struct udphdr *uh = udp_hdr(skb); + struct udphdr *uh; u8 tmp; + /* In the case of RAW sockets the transport header is not set by + * the ip6 stack so we must set it ourselves + */ + if (skb->transport_header == skb->network_header) + skb_set_transport_header(skb, sizeof(struct ipv6hdr)); + + uh = udp_hdr(skb); + if (((ntohs(uh->source) & LOWPAN_NHC_UDP_4BIT_MASK) == LOWPAN_NHC_UDP_4BIT_PORT) && ((ntohs(uh->dest) & LOWPAN_NHC_UDP_4BIT_MASK) == |