OCPBUGS-6596: Address CVE-2022-41717 by pierreprinetti · Pull Request #251 · openshift/cluster-api-provider-openstack

pierreprinetti · 2023-01-24T12:18:07Z

Bump golang.org/x/net to v0.4.0

openshift-ci-robot · 2023-01-24T12:18:12Z

@pierreprinetti: This pull request references Jira Issue OCPBUGS-6596, which is invalid:

expected dependent Jira Issue OCPBUGS-6595 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is Closed (Won't Do) instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Bump golang.org/x/net to v0.4.0

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.

openshift-ci · 2023-01-24T12:18:13Z

@pierreprinetti: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

OCPBUGS-6596: Address CVE-2022-41717

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.

pierreprinetti · 2023-01-24T12:19:23Z

/jira refresh

openshift-ci-robot · 2023-01-24T12:19:30Z

@pierreprinetti: This pull request references Jira Issue OCPBUGS-6596, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.10.z) matches configured target version for branch (4.10.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-6595 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
dependent Jira Issue OCPBUGS-6595 targets the "4.11.z" version, which is one of the valid target versions: 4.11.0, 4.11.z
bug has dependents

Requesting review from QA contact:
/cc @eurijon

Details

In response to this:

/jira refresh

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.

openshift-ci · 2023-01-24T12:19:34Z

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: eurijon.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

@pierreprinetti: This pull request references Jira Issue OCPBUGS-6596, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

bug is open, matching expected state (open)

bug target version (4.10.z) matches configured target version for branch (4.10.z)

bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

dependent bug Jira Issue OCPBUGS-6595 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))

dependent Jira Issue OCPBUGS-6595 targets the "4.11.z" version, which is one of the valid target versions: 4.11.0, 4.11.z

bug has dependents

Requesting review from QA contact:
/cc @eurijon

In response to this:

/jira refresh

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.

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.

pierreprinetti · 2023-01-24T14:33:48Z

/retest-required

pierreprinetti · 2023-01-27T20:26:56Z

/retest

openshift-ci · 2023-01-27T22:26:11Z

@pierreprinetti: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-openstack-proxy	`8448fc0`	link	false	`/test e2e-openstack-proxy`

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

mandre

/lgtm
/approve
/label backport-risk-assessed

openshift-ci · 2023-02-07T09:27:22Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mandre

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:

~~OWNERS~~ [mandre]

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

eurijon · 2023-02-09T12:39:23Z

/label cherry-pick-approved

openshift-ci-robot · 2023-02-09T12:44:25Z

@pierreprinetti: All pull requests linked via external trackers have merged:

openshift/cluster-api-provider-openstack#251

Jira Issue OCPBUGS-6596 has been moved to the MODIFIED state.

Details

In response to this:

Bump golang.org/x/net to v0.4.0

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.

pierreprinetti · 2023-02-09T12:56:42Z

/cherry-pick release-4.9

openshift-cherrypick-robot · 2023-02-09T12:57:25Z

@pierreprinetti: #251 failed to apply on top of branch "release-4.9":

Applying: Address CVE-2022-41717
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/golang.org/x/net/http2/client_conn_pool.go
M	vendor/golang.org/x/net/http2/errors.go
M	vendor/golang.org/x/net/http2/frame.go
M	vendor/golang.org/x/net/http2/hpack/huffman.go
M	vendor/golang.org/x/net/http2/server.go
M	vendor/golang.org/x/net/http2/transport.go
A	vendor/golang.org/x/sys/unix/ifreq_linux.go
M	vendor/golang.org/x/sys/unix/ioctl_linux.go
M	vendor/golang.org/x/sys/unix/mkerrors.sh
M	vendor/golang.org/x/sys/unix/sockcmsg_linux.go
M	vendor/golang.org/x/sys/unix/syscall_darwin.go
M	vendor/golang.org/x/sys/unix/syscall_illumos.go
M	vendor/golang.org/x/sys/unix/syscall_linux.go
M	vendor/golang.org/x/sys/unix/syscall_linux_386.go
M	vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
M	vendor/golang.org/x/sys/unix/syscall_linux_arm.go
M	vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
M	vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
M	vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
M	vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
M	vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
M	vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
M	vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/syscall_solaris.go
M	vendor/golang.org/x/sys/unix/syscall_unix.go
A	vendor/golang.org/x/sys/unix/sysvshm_unix.go
M	vendor/golang.org/x/sys/unix/zerrors_linux.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_386.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
M	vendor/golang.org/x/sys/unix/zsyscall_linux.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
M	vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
M	vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
M	vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
M	vendor/golang.org/x/sys/unix/ztypes_illumos_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_386.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
M	vendor/golang.org/x/sys/windows/mksyscall.go
M	vendor/golang.org/x/sys/windows/syscall.go
M	vendor/golang.org/x/sys/windows/syscall_windows.go
M	vendor/golang.org/x/sys/windows/types_windows.go
M	vendor/golang.org/x/sys/windows/zsyscall_windows.go
M	vendor/golang.org/x/term/term.go
M	vendor/golang.org/x/text/internal/language/parse.go
M	vendor/golang.org/x/text/language/parse.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/golang.org/x/text/language/parse.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/text/language/parse.go
Removing vendor/golang.org/x/text/language/go1_2.go
Removing vendor/golang.org/x/text/language/go1_1.go
Auto-merging vendor/golang.org/x/text/internal/language/parse.go
Removing vendor/golang.org/x/text/CONTRIBUTORS
Removing vendor/golang.org/x/text/AUTHORS
Auto-merging vendor/golang.org/x/term/term.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/term/term.go
Removing vendor/golang.org/x/term/CONTRIBUTORS
Removing vendor/golang.org/x/term/AUTHORS
Auto-merging vendor/golang.org/x/sys/windows/zsyscall_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/types_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/types_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall.go
Removing vendor/golang.org/x/sys/windows/setupapierrors_windows.go
Auto-merging vendor/golang.org/x/sys/windows/mksyscall.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/ztypes_illumos_amd64.go deleted in Address CVE-2022-41717 and modified in HEAD. Version HEAD of vendor/golang.org/x/sys/unix/ztypes_illumos_amd64.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
Removing vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.s
Removing vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_13.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
Removing vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.s
Removing vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_13.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/sysvshm_unix.go deleted in HEAD and modified in Address CVE-2022-41717. Version Address CVE-2022-41717 of vendor/golang.org/x/sys/unix/sysvshm_unix.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/syscall_unix.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_unix.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_solaris.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_solaris.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_illumos.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_illumos.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_darwin.go
Removing vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go
Removing vendor/golang.org/x/sys/unix/syscall_darwin.1_12.go
Removing vendor/golang.org/x/sys/unix/str.go
Auto-merging vendor/golang.org/x/sys/unix/sockcmsg_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/sockcmsg_linux.go
Auto-merging vendor/golang.org/x/sys/unix/mkerrors.sh
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/mkerrors.sh
Auto-merging vendor/golang.org/x/sys/unix/ioctl_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ioctl_linux.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/ifreq_linux.go deleted in HEAD and modified in Address CVE-2022-41717. Version Address CVE-2022-41717 of vendor/golang.org/x/sys/unix/ifreq_linux.go left in tree.
Removing vendor/golang.org/x/sys/unix/errors_freebsd_arm64.go
Removing vendor/golang.org/x/sys/unix/errors_freebsd_arm.go
Removing vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go
Removing vendor/golang.org/x/sys/unix/errors_freebsd_386.go
Removing vendor/golang.org/x/sys/CONTRIBUTORS
Removing vendor/golang.org/x/sys/AUTHORS
Auto-merging vendor/golang.org/x/net/http2/transport.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/transport.go
Auto-merging vendor/golang.org/x/net/http2/server.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/server.go
Auto-merging vendor/golang.org/x/net/http2/hpack/huffman.go
Auto-merging vendor/golang.org/x/net/http2/frame.go
Auto-merging vendor/golang.org/x/net/http2/errors.go
Auto-merging vendor/golang.org/x/net/http2/client_conn_pool.go
Removing vendor/golang.org/x/net/CONTRIBUTORS
Removing vendor/golang.org/x/net/AUTHORS
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Address CVE-2022-41717
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-4.9

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.

openshift-bot · 2023-05-01T14:38:51Z

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-openstack-machine-controllers-container-v4.10.0-202305011254.p0.g963993b.assembly.stream for distgit ose-openstack-machine-controllers.
All builds following this will include this PR.

* Added compatibility information to README.md Fixes openshift#251 * Updated NOTE to bold text

Address CVE-2022-41717

8448fc0

Bump golang.org/x/net to v0.4.0

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 24, 2023

openshift-ci Bot requested review from EmilienM and mdbooth January 24, 2023 12:18

mandre reviewed Feb 7, 2023

View reviewed changes

openshift-ci Bot assigned mandre Feb 7, 2023

openshift-ci Bot added backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. lgtm Indicates that a PR is ready to be merged. labels Feb 7, 2023

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 7, 2023

openshift-ci Bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Feb 9, 2023

openshift-merge-robot merged commit 963993b into openshift:release-4.10 Feb 9, 2023

pierreprinetti deleted the release-4.10_CVE-2022-41717 branch February 9, 2023 12:56

pierreprinetti mentioned this pull request Feb 9, 2023

OCPBUGS-7266: Address CVE-2022-41717 #254

Closed

pierreprinetti pushed a commit to shiftstack/cluster-api-provider-openstack that referenced this pull request Apr 22, 2024

Added compatibility information to README.md (openshift#285)

dd916c9

* Added compatibility information to README.md Fixes openshift#251 * Updated NOTE to bold text

Conversation

pierreprinetti commented Jan 24, 2023

Uh oh!

openshift-ci-robot commented Jan 24, 2023

Uh oh!

openshift-ci Bot commented Jan 24, 2023

Uh oh!

pierreprinetti commented Jan 24, 2023

Uh oh!

openshift-ci-robot commented Jan 24, 2023

Uh oh!

openshift-ci Bot commented Jan 24, 2023

Uh oh!

pierreprinetti commented Jan 24, 2023

Uh oh!

pierreprinetti commented Jan 27, 2023

Uh oh!

openshift-ci Bot commented Jan 27, 2023

Uh oh!

mandre left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Feb 7, 2023

Uh oh!

eurijon commented Feb 9, 2023

Uh oh!

openshift-ci-robot commented Feb 9, 2023

Uh oh!

pierreprinetti commented Feb 9, 2023

Uh oh!

openshift-cherrypick-robot commented Feb 9, 2023

Uh oh!

openshift-bot commented May 1, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants