opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-14 17:55:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

CVE-2024-1753 fix for main

Browse Source 
Bump to the version of Buidah in it's main branch to get the
CVE-2024-1753 fix.

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
tomsweeneyredhat
2024-03-18 16:30:00 -04:00
parent 8a643c243e
commit 079bfb085a
72 changed files with 838 additions and 2056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/github.com/checkpoint-restore/go-criu/v7/README.md generated vendored
View File

@ -62,7 +62,7 @@ The following table shows the relation between go-criu and criu versions:
| Major version | Latest release | CRIU version |
| -------------- | -------------- | ------------ |
| v7             | 7.0.0         | 3.18         |
| v7             | 7.1.0         | 3.18         |
| v6             | 6.3.0         | 3.17         |
| v5             | 5.3.0         | 3.16         |
| v5             | 5.0.0         | 3.15         |

2
vendor/github.com/checkpoint-restore/go-criu/v7/codecov.yml generated vendored Normal file
View File

@ -0,0 +1,2 @@
ignore:
- "test"

4
vendor/github.com/checkpoint-restore/go-criu/v7/features.go generated vendored
View File

@ -1,7 +1,7 @@
package criu
import (
"fmt"
"errors"
"github.com/checkpoint-restore/go-criu/v7/rpc"
)
@ -38,7 +38,7 @@ func (c *Criu) FeatureCheck(features *rpc.CriuFeatures) (*rpc.CriuFeatures, erro
}
if resp.GetType() != rpc.CriuReqType_FEATURE_CHECK {
return nil, fmt.Errorf("unexpected CRIU RPC response")
return nil, errors.New("unexpected CRIU RPC response")
}
return features, nil

16
vendor/github.com/checkpoint-restore/go-criu/v7/main.go generated vendored
View File

@ -218,7 +218,7 @@ func (c *Criu) StartPageServerChld(opts *rpc.CriuOpts) (int, int, error) {
return 0, 0, err
}
return int(resp.Ps.GetPid()), int(resp.Ps.GetPort()), nil
return int(resp.GetPs().GetPid()), int(resp.GetPs().GetPort()), nil
}
// GetCriuVersion executes the VERSION RPC call and returns the version
@ -230,22 +230,22 @@ func (c *Criu) GetCriuVersion() (int, error) {
}
if resp.GetType() != rpc.CriuReqType_VERSION {
return 0, fmt.Errorf("unexpected CRIU RPC response")
return 0, errors.New("unexpected CRIU RPC response")
}
version := int(*resp.GetVersion().MajorNumber) * 10000
version += int(*resp.GetVersion().MinorNumber) * 100
if resp.GetVersion().Sublevel != nil {
version += int(*resp.GetVersion().Sublevel)
version := resp.GetVersion().GetMajorNumber() * 10000
version += resp.GetVersion().GetMinorNumber() * 100
if resp.GetVersion().GetSublevel() != 0 {
version += resp.GetVersion().GetSublevel()
}
if resp.GetVersion().Gitid != nil {
if resp.GetVersion().GetGitid() != "" {
// taken from runc: if it is a git release -> increase minor by 1
version -= (version % 100)
version += 100
}
return version, nil
return int(version), nil
}
// IsCriuAtLeast checks if the version is at least the same