From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 28 Jun 2017 20:01:18 +0000 (-0400)
Subject: Revert "resolved: drop unnecessary comparison (#6220)"
X-Git-Tag: v234~64
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f3e486fa7b00cbf25ad64f33b59ea58b9fb06a7;p=platform%2Fupstream%2Fsystemd.git

Revert "resolved: drop unnecessary comparison (#6220)"

This reverts commit d718d20225bd631360ca5502b873278416616a03.
---

diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
index 4f4674b..a486216 100644
--- a/src/resolve/resolved-dns-packet.c
+++ b/src/resolve/resolved-dns-packet.c
@@ -57,7 +57,7 @@ int dns_packet_new(DnsPacket **ret, DnsProtocol protocol, size_t mtu) {
         if (mtu < UDP_PACKET_HEADER_SIZE)
                 a = DNS_PACKET_SIZE_START;
         else
-                a = mtu;
+                a = MAX(mtu, DNS_PACKET_HEADER_SIZE);
 
         /* round up to next page size */
         a = PAGE_ALIGN(ALIGN(sizeof(DnsPacket)) + a) - ALIGN(sizeof(DnsPacket));