summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-05-10 20:03:35 +0000
committergVisor bot <gvisor-bot@google.com>2021-05-10 20:03:35 +0000
commit900c1eb89d615a39ef89e4aef2470a2979b54db8 (patch)
tree483b8853ddd46abd8ff7c536f4a5d319c5552b7d
parent949c81431d5b8eb0c9acb47ee1c401803474c243 (diff)
parent6c349c675c49f1059efbcadb6b04123ab2357ca2 (diff)
Merge release-20210503.0-30-g6c349c675 (automated)
-rw-r--r--runsc/cmd/mitigate.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/runsc/cmd/mitigate.go b/runsc/cmd/mitigate.go
index d37ab80ba..f4e65adb8 100644
--- a/runsc/cmd/mitigate.go
+++ b/runsc/cmd/mitigate.go
@@ -18,6 +18,7 @@ import (
"context"
"fmt"
"io/ioutil"
+ "runtime"
"github.com/google/subcommands"
"gvisor.dev/gvisor/pkg/log"
@@ -72,6 +73,11 @@ func (m *Mitigate) SetFlags(f *flag.FlagSet) {
// Execute implements subcommands.Command.Execute.
func (m *Mitigate) Execute(_ context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus {
+ if runtime.GOARCH == "arm64" || runtime.GOARCH == "arm" {
+ log.Warningf("As ARM is not affected by MDS, mitigate does not support")
+ return subcommands.ExitFailure
+ }
+
if f.NArg() != 0 {
f.Usage()
return subcommands.ExitUsageError