summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/loader
diff options
context:
space:
mode:
authorZhaozhong Ni <nzz@google.com>2018-08-02 10:41:44 -0700
committerShentubot <shentubot@google.com>2018-08-02 10:42:48 -0700
commit57d0fcbdbf7e9d2d573ce8d4ca2f72b82f778d63 (patch)
tree7d09abd7209c47ea68471588531bc06ff4f8655c /pkg/sentry/loader
parentcf44aff6e08b0e19935d5cd98455b4af98fd8794 (diff)
Automated rollback of changelist 207037226
PiperOrigin-RevId: 207125440 Change-Id: I6c572afb4d693ee72a0c458a988b0e96d191cd49
Diffstat (limited to 'pkg/sentry/loader')
-rw-r--r--pkg/sentry/loader/BUILD15
-rw-r--r--pkg/sentry/loader/vdso.go2
-rw-r--r--pkg/sentry/loader/vdso_state.go1
3 files changed, 4 insertions, 14 deletions
diff --git a/pkg/sentry/loader/BUILD b/pkg/sentry/loader/BUILD
index e63052c6d..0beb4561b 100644
--- a/pkg/sentry/loader/BUILD
+++ b/pkg/sentry/loader/BUILD
@@ -1,7 +1,7 @@
package(licenses = ["notice"]) # Apache 2.0
load("@io_bazel_rules_go//go:def.bzl", "go_embed_data")
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify")
+load("//tools/go_stateify:defs.bzl", "go_library")
go_embed_data(
name = "vdso_bin",
@@ -10,23 +10,12 @@ go_embed_data(
var = "vdsoBin",
)
-go_stateify(
- name = "loader_state",
- srcs = [
- "vdso.go",
- "vdso_state.go",
- ],
- out = "loader_state.go",
- package = "loader",
-)
-
go_library(
name = "loader",
srcs = [
"elf.go",
"interpreter.go",
"loader.go",
- "loader_state.go",
"vdso.go",
"vdso_state.go",
":vdso_bin",
@@ -40,7 +29,6 @@ go_library(
"//pkg/cpuid",
"//pkg/log",
"//pkg/rand",
- "//pkg/refs",
"//pkg/sentry/arch",
"//pkg/sentry/context",
"//pkg/sentry/fs",
@@ -55,7 +43,6 @@ go_library(
"//pkg/sentry/uniqueid",
"//pkg/sentry/usage",
"//pkg/sentry/usermem",
- "//pkg/state",
"//pkg/syserror",
"//pkg/waiter",
],
diff --git a/pkg/sentry/loader/vdso.go b/pkg/sentry/loader/vdso.go
index 2e8693f8e..a06e27ac9 100644
--- a/pkg/sentry/loader/vdso.go
+++ b/pkg/sentry/loader/vdso.go
@@ -193,6 +193,8 @@ func validateVDSO(ctx context.Context, f *fs.File, size uint64) (elfInfo, error)
//
// NOTE: to support multiple architectures or operating systems, this
// would need to contain a VDSO for each.
+//
+// +stateify savable
type VDSO struct {
// ParamPage is the VDSO parameter page. This page should be updated to
// inform the VDSO for timekeeping data.
diff --git a/pkg/sentry/loader/vdso_state.go b/pkg/sentry/loader/vdso_state.go
index 92004ad9e..dc71e1c2d 100644
--- a/pkg/sentry/loader/vdso_state.go
+++ b/pkg/sentry/loader/vdso_state.go
@@ -18,6 +18,7 @@ import (
"debug/elf"
)
+// +stateify savable
type elfProgHeader struct {
Type elf.ProgType
Flags elf.ProgFlag