summaryrefslogtreecommitdiffhomepage
path: root/pkg
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-01-21 17:59:00 -0800
committergVisor bot <gvisor-bot@google.com>2020-01-21 17:59:00 -0800
commitf6225b111bc03d0b4682c9b1f6b810a7d17ec0a4 (patch)
tree98683fc928f39982f5e43467384a370cab020751 /pkg
parent2296b4734462b6eeef383ea58e2b1b0b1a214d76 (diff)
parentc0e39a8271198f10407009ec1994e5d9efac796c (diff)
Merge pull request #1609 from xiaobo55x:uname
PiperOrigin-RevId: 290849438
Diffstat (limited to 'pkg')
-rw-r--r--pkg/sentry/syscalls/linux/sys_utsname.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/pkg/sentry/syscalls/linux/sys_utsname.go b/pkg/sentry/syscalls/linux/sys_utsname.go
index 748e8dd8d..a393e28c1 100644
--- a/pkg/sentry/syscalls/linux/sys_utsname.go
+++ b/pkg/sentry/syscalls/linux/sys_utsname.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// +build amd64
+// +build amd64 arm64
package linux
@@ -35,7 +35,15 @@ func Uname(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Syscall
copy(u.Nodename[:], uts.HostName())
copy(u.Release[:], version.Release)
copy(u.Version[:], version.Version)
- copy(u.Machine[:], "x86_64") // build tag above.
+ // build tag above.
+ switch t.SyscallTable().Arch {
+ case arch.AMD64:
+ copy(u.Machine[:], "x86_64")
+ case arch.ARM64:
+ copy(u.Machine[:], "aarch64")
+ default:
+ copy(u.Machine[:], "unknown")
+ }
copy(u.Domainname[:], uts.DomainName())
// Copy out the result.