kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fixes a panic in the DNS resolver

Browse source 
Under certain conditions it appears that the DNS response and returned
error can be nil. When this happens, checking resp.Truncated results in
a nil panic so we must first check that the response is not nil before
checking if a truncated response was received.

See moby/moby#40715

Signed-off-by: Sam Whited <sam@samwhited.com>
This commit is contained in:
Sam Whited 2020-03-18 12:06:23 -04:00
parent c485bbf754
commit 1e02aae252
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/resolver.go
View file

@ -484,7 +484,7 @@ func (r *resolver) ServeDNS(w dns.ResponseWriter, query *dns.Msg) {
resp, err = co.ReadMsg() resp, err = co.ReadMsg()
// Truncated DNS replies should be sent to the client so that the // Truncated DNS replies should be sent to the client so that the
// client can retry over TCP // client can retry over TCP
if err != nil && !resp.Truncated { if err != nil && (resp != nil && !resp.Truncated) {
r.forwardQueryEnd() r.forwardQueryEnd()
logrus.Debugf("[resolver] read from DNS server failed, %s", err) logrus.Debugf("[resolver] read from DNS server failed, %s", err)
continue continue