github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 06:52:13 +00:00
Code Issues Projects Releases Wiki Activity

runtime: The index variable is initialized multiple times in for

Browse Source 
Change the variables `mountTypeFieldIdx := 8`, `mntDestIdx := 4` and `netNsMountType := "nsfs"` to const.

And unify the variable naming style, modify `mntDestIdx` to `mountDestIdx`.

Fixes: #3646

Signed-off-by: yaoyinnan <yaoyinnan@foxmail.com>
This commit is contained in:
yaoyinnan 2022-02-12 11:10:10 +08:00
parent dfbde2e06c
commit 42a878e6c1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/runtime/pkg/katautils/network.go
View File

@ -94,10 +94,14 @@ func SetupNetworkNamespace(config *vc.NetworkConfig) error {
return nil return nil
} }
const (
netNsMountType = "nsfs"
mountTypeFieldIdx = 8
mountDestIdx = 4
)
// getNetNsFromBindMount returns the network namespace for the bind-mounted path // getNetNsFromBindMount returns the network namespace for the bind-mounted path
func getNetNsFromBindMount(nsPath string, procMountFile string) (string, error) { func getNetNsFromBindMount(nsPath string, procMountFile string) (string, error) {
netNsMountType := "nsfs"
// Resolve all symlinks in the path as the mountinfo file contains // Resolve all symlinks in the path as the mountinfo file contains
// resolved paths. // resolved paths.
nsPath, err := filepath.EvalSymlinks(nsPath) nsPath, err := filepath.EvalSymlinks(nsPath)
@ -129,14 +133,12 @@ func getNetNsFromBindMount(nsPath string, procMountFile string) (string, error)
} }
// We check here if the mount type is a network namespace mount type, namely "nsfs" // We check here if the mount type is a network namespace mount type, namely "nsfs"
mountTypeFieldIdx := 8
if fields[mountTypeFieldIdx] != netNsMountType { if fields[mountTypeFieldIdx] != netNsMountType {
continue continue
} }
// This is the mount point/destination for the mount // This is the mount point/destination for the mount
mntDestIdx := 4 if fields[mountDestIdx] != nsPath {
if fields[mntDestIdx] != nsPath {
continue continue
} }