From: Rafael Vuijk <r.vuijk@sownet.nl>
To: Alexander Aring <alex.aring@gmail.com>,
Jukka Rissanen <jukka.rissanen@linux.intel.com>,
linux-wpan@vger.kernel.org, linux-bluetooth@vger.kernel.org
Subject: [PATCH 1/2 v2] ieee802154: assembly of 6LoWPAN fragments improvement
Date: Tue, 17 Jul 2018 17:25:47 +0200 [thread overview]
Message-ID: <20180717152546.GA22664@Rafael-Mac.intra.sownet.nl> (raw)
6LoWPAN reassembly length check matching first known packet length.
Signed-off-by: Rafael Vuijk <r.vuijk@sownet.nl>
--- ./net/ieee802154/6lowpan/reassembly.c 2018-02-20 11:10:06.000000000 +0100
+++ ./net/ieee802154/6lowpan/reassembly.c 2018-02-21 09:13:29.000000000 +0100
@@ -140,23 +140,14 @@ static int lowpan_frag_queue(struct lowp
offset = lowpan_802154_cb(skb)->d_offset << 3;
end = lowpan_802154_cb(skb)->d_size;
+ if (fq->q.len == 0)
+ fq->q.len = end;
+ if (fq->q.len != end)
+ goto err;
+
/* Is this the final fragment? */
if (offset + skb->len == end) {
- /* If we already have some bits beyond end
- * or have different end, the segment is corrupted.
- */
- if (end < fq->q.len ||
- ((fq->q.flags & INET_FRAG_LAST_IN) && end != fq->q.len))
- goto err;
fq->q.flags |= INET_FRAG_LAST_IN;
- fq->q.len = end;
- } else {
- if (end > fq->q.len) {
- /* Some bits beyond end -> corruption. */
- if (fq->q.flags & INET_FRAG_LAST_IN)
- goto err;
- fq->q.len = end;
- }
}
/* Find out which fragments are in front and at the back of us
next reply other threads:[~2018-07-17 15:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-17 15:25 Rafael Vuijk [this message]
2018-07-24 13:00 ` [PATCH 1/2 v2] ieee802154: assembly of 6LoWPAN fragments improvement Stefan Schmidt
2018-07-24 15:20 ` Michael Richardson
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=20180717152546.GA22664@Rafael-Mac.intra.sownet.nl \
--to=r.vuijk@sownet.nl \
--cc=alex.aring@gmail.com \
--cc=jukka.rissanen@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-wpan@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.