diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-02 15:44:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-02 15:44:15 +0200 |
| commit | d10addca6c4eef4a3ab93336d1080eead3784caa (patch) | |
| tree | 83d89962d041c754d7cf456fba942a86431d97d7 /vendor | |
| parent | 2937151e376dd1f44c95af2f94d2a9ca24fb9f86 (diff) | |
| parent | 4157af8776c0d4b949efa034e40b4abaa4b6af57 (diff) | |
| download | podman-d10addca6c4eef4a3ab93336d1080eead3784caa.tar.gz podman-d10addca6c4eef4a3ab93336d1080eead3784caa.tar.bz2 podman-d10addca6c4eef4a3ab93336d1080eead3784caa.zip | |
Merge pull request #6457 from rhatdan/psgo
Update vendor containers/psgo
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/psgo/SECURITY.md | 3 | ||||
| -rw-r--r-- | vendor/github.com/containers/psgo/psgo.go | 4 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/vendor/github.com/containers/psgo/SECURITY.md b/vendor/github.com/containers/psgo/SECURITY.md new file mode 100644 index 000000000..5d5ba254a --- /dev/null +++ b/vendor/github.com/containers/psgo/SECURITY.md @@ -0,0 +1,3 @@ +## Security and Disclosure Information Policy for the psgo Project + +The psgo Project follows the [Security and Disclosure Information Policy](https://github.com/containers/common/blob/master/SECURITY.md) for the Containers Projects. diff --git a/vendor/github.com/containers/psgo/psgo.go b/vendor/github.com/containers/psgo/psgo.go index 57132c94e..c75fc3815 100644 --- a/vendor/github.com/containers/psgo/psgo.go +++ b/vendor/github.com/containers/psgo/psgo.go @@ -847,7 +847,7 @@ func processHPID(p *process.Process, ctx *psContext) (string, error) { func processHUSER(p *process.Process, ctx *psContext) (string, error) { if hp := findHostProcess(p, ctx); hp != nil { if ctx.opts != nil && len(ctx.opts.UIDMap) > 0 { - return findID(p.Status.Uids[1], ctx.opts.UIDMap, process.LookupUID, "/proc/sys/fs/overflowuid") + return findID(hp.Status.Uids[1], ctx.opts.UIDMap, process.LookupUID, "/proc/sys/fs/overflowuid") } return hp.Huser, nil } @@ -860,7 +860,7 @@ func processHUSER(p *process.Process, ctx *psContext) (string, error) { func processHGROUP(p *process.Process, ctx *psContext) (string, error) { if hp := findHostProcess(p, ctx); hp != nil { if ctx.opts != nil && len(ctx.opts.GIDMap) > 0 { - return findID(p.Status.Gids[1], ctx.opts.GIDMap, process.LookupGID, "/proc/sys/fs/overflowgid") + return findID(hp.Status.Gids[1], ctx.opts.GIDMap, process.LookupGID, "/proc/sys/fs/overflowgid") } return hp.Hgroup, nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index 55279502d..b84d9e017 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -146,7 +146,7 @@ github.com/containers/ocicrypt/keywrap/pgp github.com/containers/ocicrypt/keywrap/pkcs7 github.com/containers/ocicrypt/spec github.com/containers/ocicrypt/utils -# github.com/containers/psgo v1.5.0 +# github.com/containers/psgo v1.5.1 github.com/containers/psgo github.com/containers/psgo/internal/capabilities github.com/containers/psgo/internal/cgroups |