From edbd20302734797bc3283b6f4b7e1448ee8b691c Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Tue, 12 Apr 2022 23:30:43 -0700
Subject: [PATCH] kvm: handle errors of updateSystemValues

PiperOrigin-RevId: 441390130
---
 pkg/sentry/platform/kvm/kvm_amd64.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/sentry/platform/kvm/kvm_amd64.go b/pkg/sentry/platform/kvm/kvm_amd64.go
index 7a099d49c..b7c879163 100644
--- a/pkg/sentry/platform/kvm/kvm_amd64.go
+++ b/pkg/sentry/platform/kvm/kvm_amd64.go
@@ -219,7 +219,9 @@ func (c *cpuidEntries) Set(in cpuid.In, out cpuid.Out) {
 
 // updateGlobalOnce does global initialization. It has to be called only once.
 func updateGlobalOnce(fd int) error {
-	err := updateSystemValues(int(fd))
+	if err := updateSystemValues(int(fd)); err != nil {
+		return err
+	}
 	fs := cpuid.FeatureSet{
 		Function: &cpuidSupported,
 	}
@@ -238,5 +240,5 @@ func updateGlobalOnce(fd int) error {
 		Function: s,
 	})
 	physicalInit()
-	return err
+	return nil
 }