diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-11 10:36:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 10:36:54 -0400 |
| commit | 8dcd5b893feb8b3b34386e6688d20b7ef098228b (patch) | |
| tree | d8faac5bbd3c5dd91c0de0e94c5d9252c5485d0d /vendor/golang.org/x/sys/unix/syscall_linux.go | |
| parent | 58915f2974c6f14ff2aa34004e7d581d1a05a148 (diff) | |
| parent | d71672c57b5e9e41cb526b290b8b3704232e814a (diff) | |
| download | podman-8dcd5b893feb8b3b34386e6688d20b7ef098228b.tar.gz podman-8dcd5b893feb8b3b34386e6688d20b7ef098228b.tar.bz2 podman-8dcd5b893feb8b3b34386e6688d20b7ef098228b.zip | |
Merge pull request #10304 from containers/dependabot/go_modules/github.com/opencontainers/runc-1.0.0-rc94
Bump github.com/opencontainers/runc from 1.0.0-rc93 to 1.0.0-rc94
Diffstat (limited to 'vendor/golang.org/x/sys/unix/syscall_linux.go')
| -rw-r--r-- | vendor/golang.org/x/sys/unix/syscall_linux.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go index 4263953be..2dd7c8e34 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux.go @@ -1151,7 +1151,11 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) { func Accept(fd int) (nfd int, sa Sockaddr, err error) { var rsa RawSockaddrAny var len _Socklen = SizeofSockaddrAny - nfd, err = accept(fd, &rsa, &len) + // Try accept4 first for Android, then try accept for kernel older than 2.6.28 + nfd, err = accept4(fd, &rsa, &len, 0) + if err == ENOSYS { + nfd, err = accept(fd, &rsa, &len) + } if err != nil { return } |