Merge pull request #7184 from keszybz/resolved-loop

resolved: fix loop on packets with pseudo dns types https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1725351, CVE-2017-15908.
2017-10-26 15:29:03 +02:00
parent 35682fd4a1 9f939335a0
commit 8aeadf3052
1 changed files with 1 additions and 5 deletions
@@ -1514,7 +1514,7 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta

                found = true;

-                while (bitmask) {
+                for (; bitmask; bit++, bitmask >>= 1)
                        if (bitmap[i] & bitmask) {
                                uint16_t n;

@@ -1528,10 +1528,6 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta
                                if (r < 0)
                                        return r;
                        }
-
-                        bit++;
-                        bitmask >>= 1;
-                }
        }

        if (!found)