aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/vminfo/linux.go
diff options
context:
space:
mode:
authorJoey Jiao <quic_jiangenj@quicinc.com>2024-07-08 11:08:29 +0800
committerAleksandr Nogikh <nogikh@google.com>2024-07-10 09:29:04 +0000
commite7213be306a4b6eb76d4c0e34a1a99ebab5639ac (patch)
tree5b058ce192f157ecb1bab6a14a7ae79a3053ab60 /pkg/vminfo/linux.go
parent9e136b95503a540d35e7bace3e89b77f13a672b1 (diff)
all: move KernelModule into vminfo package
Diffstat (limited to 'pkg/vminfo/linux.go')
-rw-r--r--pkg/vminfo/linux.go10
1 files changed, 4 insertions, 6 deletions
diff --git a/pkg/vminfo/linux.go b/pkg/vminfo/linux.go
index d6b83ef2f..23b317010 100644
--- a/pkg/vminfo/linux.go
+++ b/pkg/vminfo/linux.go
@@ -13,8 +13,6 @@ import (
"sort"
"strconv"
"strings"
-
- "github.com/google/syzkaller/pkg/cover"
)
type linux int
@@ -45,13 +43,13 @@ func (linux) machineInfos() []machineInfoFunc {
}
}
-func (linux) parseModules(files filesystem) ([]*cover.KernelModule, error) {
+func (linux) parseModules(files filesystem) ([]*KernelModule, error) {
_, err := files.ReadFile("/proc/sentry-meminfo")
if err == nil {
// This is gVisor.
return nil, nil
}
- var modules []*cover.KernelModule
+ var modules []*KernelModule
re := regexp.MustCompile(`(\w+) ([0-9]+) .*(0[x|X][a-fA-F0-9]+)[^\n]*`)
modulesText, _ := files.ReadFile("/proc/modules")
for _, match := range re.FindAllSubmatch(modulesText, -1) {
@@ -72,7 +70,7 @@ func (linux) parseModules(files filesystem) ([]*cover.KernelModule, error) {
return nil, fmt.Errorf("module %v size parsing error: %w", name, err)
}
offset := modAddr - textAddr
- modules = append(modules, &cover.KernelModule{
+ modules = append(modules, &KernelModule{
Name: name,
Addr: textAddr,
// The size is wrong as there is overlap in /proc/modules
@@ -86,7 +84,7 @@ func (linux) parseModules(files filesystem) ([]*cover.KernelModule, error) {
if err != nil {
return nil, err
}
- modules = append(modules, &cover.KernelModule{
+ modules = append(modules, &KernelModule{
Name: "",
Addr: _stext,
Size: _etext - _stext,