Skip to content

Commit

Permalink
Merge pull request #205 from spolti/RHOAIENG-7299
Browse files Browse the repository at this point in the history
[RHOAIENG-7299] - Infinite loop in JSON unmarshaling in google.golang…
  • Loading branch information
openshift-merge-bot[bot] authored May 20, 2024
2 parents a3df072 + c9922e6 commit 373d84f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,8 @@ replace (
// Fixes CVE-2023-45288
golang.org/x/net => golang.org/x/net v0.23.0
// can be removed when the indirect depdency is in the same version or higher
// Fixes Stack-based Buffer Overflow on protobuf
// https://security.snyk.io/vuln/SNYK-GOLANG-GOOGLEGOLANGORGPROTOBUFENCODINGPROTOJSON-6137908
google.golang.org/protobuf => google.golang.org/protobuf v1.32.0
// Fixes CVE-2024-24786 - Infinite loop in JSON unmarshaling in google.golang.org/protobuf
google.golang.org/protobuf => google.golang.org/protobuf v1.33.0
// pin to 0.26.4 to avoid https://github.com/kubernetes-sigs/controller-runtime/issues/2302
k8s.io/api => k8s.io/api v0.26.4
// remove when upgrade to controller-runtime 0.15.x or apimachinery to 0.27.x
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0=
google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down

0 comments on commit 373d84f

Please sign in to comment.