netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexander Aring <alex.aring@gmail.com>
To: alex.bluesman.smirnov@gmail.com
Cc: linux-zigbee-devel@lists.sourceforge.net, werner@almesberger.net,
	jukka.rissanen@linux.intel.com, dbaryshkov@gmail.com,
	netdev@vger.kernel.org, Alexander Aring <alex.aring@gmail.com>
Subject: [PATCH net-next 2/6] 6lowpan: fix udp compress ordering
Date: Thu, 14 Nov 2013 16:48:48 +0100	[thread overview]
Message-ID: <1384444132-1427-3-git-send-email-alex.aring@gmail.com> (raw)
In-Reply-To: <1384444132-1427-1-git-send-email-alex.aring@gmail.com>

In case ((ntohs(uh->source) & LOWPAN_NHC_UDP_8BIT_MASK) the order of
uncompression is wrong. It's always first source port then destination
port as second.

See:
http://tools.ietf.org/html/rfc6282#section-4.3.3

"Fields carried in-line (in part or in whole) appear in the same order
as they do in the UDP header format"

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 net/ieee802154/6lowpan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index 8633379..ad6755a 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -359,8 +359,8 @@ lowpan_compress_udp_header(u8 **hc06_ptr, struct sk_buff *skb)
 			LOWPAN_NHC_UDP_8BIT_PORT) {
 		pr_debug("UDP header: remove 8 bits of source\n");
 		**hc06_ptr = LOWPAN_NHC_UDP_CS_P_10;
-		memcpy(*hc06_ptr + 1, &uh->dest, 2);
-		*(*hc06_ptr + 3) = (u8)(uh->source - LOWPAN_NHC_UDP_8BIT_PORT);
+		*(*hc06_ptr + 1) = (u8)(uh->source - LOWPAN_NHC_UDP_8BIT_PORT);
+		memcpy(*hc06_ptr + 2, &uh->dest, 2);
 		*hc06_ptr += 4;
 	} else {
 		pr_debug("UDP header: can't compress\n");
-- 
1.8.4.2

  parent reply	other threads:[~2013-11-14 15:49 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-14 15:48 [PATCH net-next 0/6] 6lowpan: udp compression/uncompression fix Alexander Aring
2013-11-14 15:48 ` [PATCH net-next 1/6] 6lowpan: fix udp nullpointer dereferencing Alexander Aring
     [not found]   ` <1384444132-1427-2-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-11-14 17:17     ` Werner Almesberger
2013-11-14 15:48 ` Alexander Aring [this message]
     [not found] ` <1384444132-1427-1-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-11-14 15:48   ` [PATCH net-next 3/6] 6lowpan: fix udp byte ordering Alexander Aring
2013-11-14 15:48   ` [PATCH net-next 4/6] 6lowpan: add udp warning for elided checksum Alexander Aring
2013-11-14 16:32     ` Joe Perches
2013-11-14 16:50       ` Alexander Aring
2013-11-14 15:48   ` [PATCH net-next 5/6] 6lowpan: udp use lowpan_fetch_skb function Alexander Aring
2013-11-14 15:48   ` [PATCH net-next 6/6] 6lowpan: udp use subtraction on both conditions Alexander Aring
2013-11-14 16:19   ` [PATCH net-next 0/6] 6lowpan: udp compression/uncompression fix Eric Dumazet
2013-11-14 16:53     ` Alexander Aring
2013-11-14 22:06     ` David Miller
2013-11-15  5:12       ` Alexander Aring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1384444132-1427-3-git-send-email-alex.aring@gmail.com \
    --to=alex.aring@gmail.com \
    --cc=alex.bluesman.smirnov@gmail.com \
    --cc=dbaryshkov@gmail.com \
    --cc=jukka.rissanen@linux.intel.com \
    --cc=linux-zigbee-devel@lists.sourceforge.net \
    --cc=netdev@vger.kernel.org \
    --cc=werner@almesberger.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).