Skip to content

Fix NPE due to null value returned by ep.Iface() #2544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2020

Conversation

arkodg
Copy link
Contributor

@arkodg arkodg commented Apr 3, 2020

This PR carryforwards #2239
and incorporates the suggestions in comments to fix the NPE and
potential NPEs due to null value returned by ep.Iface()

closes #2239
addresses moby/moby#37506

@arkodg arkodg requested a review from thaJeztah April 3, 2020 04:29
This PR carryforwards moby#2239
and incorporates the suggestions in comments to fix the NPE and
potential NPEs due to a null value returned by ep.Iface()

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
@arkodg arkodg force-pushed the fix-npe-ep-iface branch from 66df9ee to c55657f Compare April 3, 2020 05:35
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@thaJeztah
Copy link
Member

ping @selansen @cpuguy83 @euanh PTAL

Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@arkodg arkodg merged commit e47c0ea into moby:master Apr 4, 2020
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Apr 10, 2020
full diff: moby/libnetwork@0941c3f...b9bcf0c

- moby/libnetwork#2545 Fix NPE due to null value returned by ep.Iface()
    - backport of moby/libnetwork#2544
    - addresses moby#37506

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Apr 21, 2020
full diff: moby/libnetwork@ef149a9...1a17fb3

- moby/libnetwork#2538 produce an error with invalid address pool
    - addresses moby#40388 dockerd ignores the --default-address-pool option
- moby/libnetwork#2471 DOCKER-USER chain not created when IPTableEnable=false
- moby/libnetwork#2544 Fix NPE due to null value returned by ep.Iface()
    - carries moby/libnetwork#2239 Prevent NPE in addServiceInfoToCluster()
    - addresses moby#37506 Error initializing docker.server while starting daemon by systemd

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Apr 25, 2020
full diff: moby/libnetwork@ef149a9...1a17fb3

- moby/libnetwork#2538 produce an error with invalid address pool
    - addresses moby/moby#40388 dockerd ignores the --default-address-pool option
- moby/libnetwork#2471 DOCKER-USER chain not created when IPTableEnable=false
- moby/libnetwork#2544 Fix NPE due to null value returned by ep.Iface()
    - carries moby/libnetwork#2239 Prevent NPE in addServiceInfoToCluster()
    - addresses moby/moby#37506 Error initializing docker.server while starting daemon by systemd

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c3808634e7a44fc5b4fb8caacd9d079f7e0a0fee
Component: engine
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Apr 30, 2020
full diff: moby/libnetwork@0941c3f...b9bcf0c

- moby/libnetwork#2545 Fix NPE due to null value returned by ep.Iface()
    - backport of moby/libnetwork#2544
    - addresses moby/moby#37506

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a6beb24dc5aec6d5919f40728720bd9c61259b15
Component: engine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants