Skip to content

Fix nil pointer deref in drain when it's reset #2645

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.

Sign up for GitHub

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

Jump to bottom
Merged
knative-prow merged 2 commits into from
Nov 22, 2022
Merged

Fix nil pointer deref in drain when it's reset #2645

knative-prow merged 2 commits into from
Nov 22, 2022

Conversation

@dprotaso
Copy link
Member

@dprotaso dprotaso commented Nov 22, 2022

Fixes: #2642

@knative-prow knative-prow bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 22, 2022
@knative-prow
Copy link

knative-prow bot commented Nov 22, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dprotaso

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@knative-prow knative-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 22, 2022
@dprotaso
Copy link
Member Author

dprotaso commented Nov 22, 2022

/cherry-pick release-1.8
/cherry-pick release-1.7
/cherry-pick release-1.6
/cherry-pick release-1.5

@knative-prow-robot
Copy link
Contributor

knative-prow-robot commented Nov 22, 2022

@dprotaso: once the present PR merges, I will cherry-pick it on top of release-1.8 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.8
/cherry-pick release-1.7
/cherry-pick release-1.6
/cherry-pick release-1.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@dprotaso
Copy link
Member Author

dprotaso commented Nov 22, 2022

/cherry-pick release-1.7

@knative-prow-robot
Copy link
Contributor

knative-prow-robot commented Nov 22, 2022

@dprotaso: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@dprotaso
Copy link
Member Author

dprotaso commented Nov 22, 2022

/cherry-pick release-1.6

@knative-prow-robot
Copy link
Contributor

knative-prow-robot commented Nov 22, 2022

@dprotaso: once the present PR merges, I will cherry-pick it on top of release-1.6 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@dprotaso
Copy link
Member Author

dprotaso commented Nov 22, 2022

/cherry-pick release-1.5

@knative-prow-robot
Copy link
Contributor

knative-prow-robot commented Nov 22, 2022

@dprotaso: once the present PR merges, I will cherry-pick it on top of release-1.5 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@dprotaso
Copy link
Member Author

dprotaso commented Nov 22, 2022

/retest

TestDialTLSWithBackoffSuccess flake

@codecov
Copy link

codecov bot commented Nov 22, 2022 •
edited
Loading

Codecov Report

Base: 81.35% // Head: 81.35% // No change to project coverage 👍

Coverage data is based on head (1f75f96) compared to base (bd66b9b).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #2645   +/-   ##
=======================================
  Coverage   81.35%   81.35%           
=======================================
  Files         162      162           
  Lines        9841     9841           
=======================================
  Hits         8006     8006           
  Misses       1594     1594           
  Partials      241      241
Impacted Files Coverage Δ
network/handlers/drain.go 97.14% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@nader-ziada
Copy link
Member

nader-ziada commented Nov 22, 2022

/lgtm

@knative-prow knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label Nov 22, 2022
@knative-prow knative-prow bot merged commit 242a3d7 into knative:main Nov 22, 2022
@knative-prow-robot knative-prow-robot mentioned this pull request Nov 22, 2022
Closed
@knative-prow-robot
Copy link
Contributor

knative-prow-robot commented Nov 22, 2022

@dprotaso: new pull request created: #2646

Details

In response to this:

/cherry-pick release-1.8
/cherry-pick release-1.7
/cherry-pick release-1.6
/cherry-pick release-1.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@knative-prow-robot knative-prow-robot mentioned this pull request Nov 22, 2022
Closed
@knative-prow-robot
Copy link
Contributor

knative-prow-robot commented Nov 22, 2022

@dprotaso: new pull request created: #2647

Details

In response to this:

/cherry-pick release-1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@knative-prow-robot
Copy link
Contributor

knative-prow-robot commented Nov 22, 2022

@dprotaso: #2645 failed to apply on top of branch "release-1.6":

Applying: fix nil pointer in the drainer when it's reset
Using index info to reconstruct a base tree...
M	network/handlers/drain.go
M	network/handlers/drain_test.go
Falling back to patching base and 3-way merge...
Auto-merging network/handlers/drain_test.go
CONFLICT (content): Merge conflict in network/handlers/drain_test.go
Auto-merging network/handlers/drain.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix nil pointer in the drainer when it's reset
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick release-1.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@knative-prow-robot
Copy link
Contributor

knative-prow-robot commented Nov 22, 2022

@dprotaso: #2645 failed to apply on top of branch "release-1.5":

Applying: fix nil pointer in the drainer when it's reset
Using index info to reconstruct a base tree...
M	network/handlers/drain.go
M	network/handlers/drain_test.go
Falling back to patching base and 3-way merge...
Auto-merging network/handlers/drain_test.go
CONFLICT (content): Merge conflict in network/handlers/drain_test.go
Auto-merging network/handlers/drain.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix nil pointer in the drainer when it's reset
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick release-1.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@dprotaso dprotaso deleted the drain-nil branch November 22, 2022 19:01
@dprotaso
Copy link
Member Author

dprotaso commented Nov 22, 2022

I realize the change was introduced in 1.7+

@dprotaso
Copy link
Member Author

dprotaso commented Nov 22, 2022

/cherry-pick release-1.8

@dprotaso
Copy link
Member Author

dprotaso commented Nov 22, 2022

/cherry-pick release-1.7

@knative-prow-robot
Copy link
Contributor

knative-prow-robot commented Nov 22, 2022

@dprotaso: new pull request created: #2651

Details

In response to this:

/cherry-pick release-1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

This was referenced Nov 22, 2022
Merged
Merged
@knative-prow-robot
Copy link
Contributor

knative-prow-robot commented Nov 22, 2022

@dprotaso: new pull request created: #2652

Details

In response to this:

/cherry-pick release-1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

This was referenced Nov 23, 2022
Merged
Merged
@skonto skonto mentioned this pull request Nov 30, 2022
Merged
@k4leung4 k4leung4 mentioned this pull request Dec 5, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nader-ziada nader-ziada

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

queue-proxy nil pointer dereference

3 participants

@dprotaso @knative-prow-robot @nader-ziada