0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix nil pointer derefence on failure to connect to containerd

Browse source 
Signed-off-by: Simão Reis <smnrsti@gmail.com>
(cherry picked from commit 3134161be3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Simão Reis 2019-01-30 12:41:54 -01:00 • committed by Sebastiaan van Stijn
parent 2e4c5c57c3
commit 0841c61862
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libcontainerd/supervisor/remote_daemon.go
View file

@ -311,6 +311,8 @@ func (r *remote) monitorDaemon(ctx context.Context) {
delay = time.After(time.Duration(transientFailureCount) * 200 * time.Millisecond) delay = time.After(time.Duration(transientFailureCount) * 200 * time.Millisecond)
continue continue
} }
client.Close()
client = nil
} }
if system.IsProcessAlive(r.daemonPid) { if system.IsProcessAlive(r.daemonPid) {
@ -318,8 +320,6 @@ func (r *remote) monitorDaemon(ctx context.Context) {
r.killDaemon() r.killDaemon()
} }
client.Close()
client = nil
r.daemonPid = -1 r.daemonPid = -1
delay = nil delay = nil
transientFailureCount = 0 transientFailureCount = 0