Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
cli: check modules and permissions before loading a module
Browse files Browse the repository at this point in the history
Before loading a module, the check subcommand should check if the
current user can load it.

fixes #3085

Signed-off-by: Julio Montes <julio.montes@intel.com>
  • Loading branch information
Julio Montes committed Nov 25, 2020
1 parent f2ff670 commit c963777
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
10 changes: 9 additions & 1 deletion cli/kata-check.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,25 @@ func getCPUFlags(cpuinfo string) string {
// haveKernelModule returns true if the specified module exists
// (either loaded or available to be loaded)
func haveKernelModule(module string) bool {
kmodLog := kataLog.WithField("module", module)

// First, check to see if the module is already loaded
path := filepath.Join(sysModuleDir, module)
if katautils.FileExists(path) {
return true
}

// Only root can load modules
if os.Getuid() != 0 {
kmodLog.Error("Module is not loaded and it can not be inserted. Please consider running with sudo or as root")
return false
}

// Now, check if the module is unloaded, but available.
// And modprobe it if so.
cmd := exec.Command(modProbeCmd, module)
if output, err := cmd.CombinedOutput(); err != nil {
kataLog.WithField("module", module).WithError(err).Warnf("modprobe insert module failed: %s", string(output))
kmodLog.WithError(err).WithField("output", string(output)).Warnf("modprobe insert module failed")
return false
}
return true
Expand Down
4 changes: 4 additions & 0 deletions cli/kata-check_amd64_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ func TestCCCheckCLIFunction(t *testing.T) {
var cpuData []testCPUData
var moduleData []testModuleData

t.Skip(testDisabledAsNonRoot)

if cpuType == cpuTypeIntel {
cpuData = []testCPUData{
{archGenuineIntel, "lm vmx sse4_1", false},
Expand Down Expand Up @@ -245,6 +247,8 @@ func TestCheckCheckKernelModulesNoUnrestrictedGuest(t *testing.T) {
}

func TestCheckHostIsVMContainerCapable(t *testing.T) {
t.Skip(testDisabledAsNonRoot)

assert := assert.New(t)

dir, err := ioutil.TempDir("", "")
Expand Down
2 changes: 2 additions & 0 deletions cli/kata-check_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,8 @@ func TestCheckCheckCPUAttribs(t *testing.T) {
}

func TestCheckHaveKernelModule(t *testing.T) {
t.Skip(testDisabledAsNonRoot)

assert := assert.New(t)

dir, err := ioutil.TempDir("", "")
Expand Down

0 comments on commit c963777

Please sign in to comment.