net: deal with fragment-overlapping-two-holes case

With a suitable sequence of malicious packets, it's currently possible
to get a hole descriptor to contain arbitrary attacker-controlled
contents, and then with one more packet to use that as an arbitrary
write vector.

While one could possibly change the algorithm so we instead loop over
all holes, and in each hole puts as much of the current fragment as
belongs there (taking care to carefully update the hole list as
appropriate), it's not worth the complexity: In real, non-malicious
scenarios, one never gets overlapping fragments, and certainly not
fragments that would be supersets of one another.

So instead opt for this simple protection: Simply don't allow the
eventual memcpy() to write beyond the last_byte of the current hole.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>

diff --git a/net/net.c b/net/net.c
index 073fb68..6f0a483 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -985,10 +985,14 @@ static struct ip_udp_hdr *__net_defragment(struct ip_udp_hdr *ip, int *lenp)
        }
 
        /*
-        * There is some overlap: fix the hole list. This code doesn't
-        * deal with a fragment that overlaps with two different holes
-        * (thus being a superset of a previously-received fragment).
+        * There is some overlap: fix the hole list. This code deals
+        * with a fragment that overlaps with two different holes
+        * (thus being a superset of a previously-received fragment)
+        * by only using the part of the fragment that fits in the
+        * first hole.
         */
+       if (h->last_byte < start + len)
+               len = h->last_byte - start;
 
        if ((h >= thisfrag) && (h->last_byte <= start + len)) {
                /* complete overlap with hole: remove hole */