From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 12 Sep 2019 12:52:08 +0000 (+0200)
Subject: resolved: fix abort when recv() returns 0
X-Git-Tag: archive/raspbian/243-7+rpi1^2~87
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9fab46cfe04fb40dbd313e6eadd60499ef0eff3e;p=systemd.git

resolved: fix abort when recv() returns 0

https://bugzilla.redhat.com/show_bug.cgi?id=1703598
(cherry picked from commit f731fd5be61858b724e0f13b3ff1131c1977654a)
(cherry picked from commit 0556c247a24027f10b23445741e75ca913e29f06)

Gbp-Pq: Name resolved-fix-abort-when-recv-returns-0.patch
---

diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
index 262f63ca..fb54d160 100644
--- a/src/resolve/resolved-dns-transaction.c
+++ b/src/resolve/resolved-dns-transaction.c
@@ -1183,8 +1183,8 @@ static int on_dns_packet(sd_event_source *s, int fd, uint32_t revents, void *use
         if (ERRNO_IS_DISCONNECT(-r)) {
                 usec_t usec;
 
-                /* UDP connection failure get reported via ICMP and then are possible delivered to us on the next
-                 * recvmsg(). Treat this like a lost packet. */
+                /* UDP connection failures get reported via ICMP and then are possibly delivered to us on the
+                 * next recvmsg(). Treat this like a lost packet. */
 
                 log_debug_errno(r, "Connection failure for DNS UDP packet: %m");
                 assert_se(sd_event_now(t->scope->manager->event, clock_boottime_or_monotonic(), &usec) >= 0);
@@ -1198,6 +1198,9 @@ static int on_dns_packet(sd_event_source *s, int fd, uint32_t revents, void *use
                 t->answer_errno = -r;
                 return 0;
         }
+        if (r == 0)
+                /* Spurious wakeup without any data */
+                return 0;
 
         r = dns_packet_validate_reply(p);
         if (r < 0) {