Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[18.09 backport] keep old network ids #149

Merged

Conversation

thaJeztah
Copy link
Member

backport of moby#38580 for 18.09

for windows all networks are re-populated in the store during network controller initialization. In current version it also regenerate network Ids which may be referenced by other components and it may cause broken references to a networks. This commit avoids regeneration of network ids.

for windows all networks are re-populated in the store during network controller initialization. In current version it also regenerate network Ids which may be referenced by other components and it may cause broken references to a networks. This commit avoids regeneration of network ids.

Signed-off-by: Andrey Kolomentsev <andrey.kolomentsev@docker.com>
(cherry picked from commit e017717)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.09.3 milestone Feb 11, 2019
@thaJeztah
Copy link
Member Author

Failure on PowerPC is unrelated, and should be fixed by #150 (I don't think a rebase is needed, as this PR only affects Windows)

21:31:40 breakoutError: "../victim/dotdot" is outside of "/tmp/docker-TestUntarInvalidFilenames681263291/dest"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestUntarInvalidHardlink637502400/victim/hello" -> "../victim/hello"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestUntarInvalidHardlink601277983/victim/hello" -> "/../victim/hello"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestUntarInvalidHardlink113006834/victim" -> "../victim"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestUntarInvalidHardlink161073065/victim" -> "../victim"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestUntarInvalidHardlink327472372/victim" -> "../victim"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestUntarInvalidHardlink988004803/victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink846077510/dest/dotdot" -> "../victim/hello"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink908380397/dest/slash-dotdot" -> "/../victim/hello"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink341034856/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink194043815/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink412541146/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink398698097/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestUntarInvalidSymlink171138332/dest/dir/loophole" -> "../../victim"
21:31:40 --- FAIL: TestTarUntarWithXattr (0.00s)
21:31:40 	archive_unix_test.go:236: assertion failed: error is not nil: invalid argument
21:31:40 breakoutError: "../victim/dotdot" is outside of "/tmp/docker-TestApplyLayerInvalidFilenames616906941/dest"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestApplyLayerInvalidHardlink502152695/victim/hello" -> "../victim/hello"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestApplyLayerInvalidHardlink517108458/victim/hello" -> "/../victim/hello"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestApplyLayerInvalidHardlink128068417/victim" -> "../victim"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestApplyLayerInvalidHardlink192443308/victim" -> "../victim"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestApplyLayerInvalidHardlink668817179/victim" -> "../victim"
21:31:40 breakoutError: invalid hardlink "/tmp/docker-TestApplyLayerInvalidHardlink650222014/victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestApplyLayerInvalidSymlink362502661/dest/dotdot" -> "../victim/hello"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestApplyLayerInvalidSymlink303792032/dest/slash-dotdot" -> "/../victim/hello"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestApplyLayerInvalidSymlink010907775/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestApplyLayerInvalidSymlink451325906/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestApplyLayerInvalidSymlink321944841/dest/loophole-victim" -> "../victim"
21:31:40 breakoutError: invalid symlink "/tmp/docker-TestApplyLayerInvalidSymlink554881748/dest/loophole-victim" -> "../victim"

@thaJeztah
Copy link
Member Author

ping @ddebroy @fcrisciani @andrewhsu PTAL

Copy link

@fcrisciani fcrisciani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewhsu andrewhsu merged commit 9dc0488 into docker-archive:18.09 Feb 21, 2019
@thaJeztah thaJeztah deleted the 18.09_backport_fix_restart branch February 21, 2019 12:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants