Merge pull request #2551 from thaJeztah/fix_error_handling

Resolver: fix error handling if we didn't receive a response
moby · May 21, 2020 · 2e24aed · 2e24aed
2 parents 1ea375d + 15ead89
commit 2e24aed
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/resolver.go b/resolver.go
@@ -484,7 +484,7 @@ func (r *resolver) ServeDNS(w dns.ResponseWriter, query *dns.Msg) {
 			resp, err = co.ReadMsg()
 			// Truncated DNS replies should be sent to the client so that the
 			// client can retry over TCP
-			if err != nil && (resp != nil && !resp.Truncated) {
+			if err != nil && (resp == nil || !resp.Truncated) {
 				r.forwardQueryEnd()
 				logrus.Debugf("[resolver] read from DNS server failed, %s", err)
 				continue