Skip to content

koordlet: fix unsafe conversion in net_cls #2173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
koordinator-bot merged 1 commit into from
Aug 22, 2024
Merged

koordlet: fix unsafe conversion in net_cls #2173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions pkg/koordlet/resourceexecutor/cgroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,24 @@ func readCgroupAndParseInt64(parentDir string, r sysutil.Resource) (int64, error
return v, nil
}

func readCgroupAndParseUint32(parentDir string, r sysutil.Resource) (uint32, error) {
// TODO: refactor with generics
s, err := cgroupFileRead(parentDir, r)
if err != nil {
return 0, err
}

// "max" means unlimited
if strings.Trim(s, "\n ") == CgroupMaxSymbolStr {
return math.MaxInt32, nil
}
v, err := strconv.ParseUint(s, 10, 32)
if err != nil {
return 0, fmt.Errorf("cannot parse cgroup value %s, err: %v", s, err)
}
return uint32(v), nil
}

func readCgroupAndParseUint64(parentDir string, r sysutil.Resource) (uint64, error) {
s, err := cgroupFileRead(parentDir, r)
if err != nil {
Expand Down
10 changes: 5 additions & 5 deletions pkg/koordlet/resourceexecutor/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ type CgroupReader interface {
ReadCPUProcs(parentDir string) ([]uint32, error)
ReadPSI(parentDir string) (*sysutil.PSIByResource, error)
ReadMemoryColdPageUsage(parentDir string) (uint64, error)
ReadNetClsId(parentDir string) (uint64, error)
ReadNetClsId(parentDir string) (uint32, error)
}

var _ CgroupReader = &CgroupV1Reader{}
Expand Down Expand Up @@ -231,12 +231,12 @@ func (r *CgroupV1Reader) ReadPSI(parentDir string) (*sysutil.PSIByResource, erro
return psi, nil
}

func (r *CgroupV1Reader) ReadNetClsId(parentDir string) (uint64, error) {
func (r *CgroupV1Reader) ReadNetClsId(parentDir string) (uint32, error) {
resource, ok := sysutil.DefaultRegistry.Get(sysutil.CgroupVersionV1, sysutil.NetClsClassIdName)
if !ok {
return 0, ErrResourceNotRegistered
}
return readCgroupAndParseUint64(parentDir, resource)
return readCgroupAndParseUint32(parentDir, resource)
}

var _ CgroupReader = &CgroupV2Reader{}
Expand Down Expand Up @@ -445,12 +445,12 @@ func (r *CgroupV2Reader) ReadPSI(parentDir string) (*sysutil.PSIByResource, erro
return psi, nil
}

func (r *CgroupV2Reader) ReadNetClsId(parentDir string) (uint64, error) {
func (r *CgroupV2Reader) ReadNetClsId(parentDir string) (uint32, error) {
resource, ok := sysutil.DefaultRegistry.Get(sysutil.CgroupVersionV2, sysutil.NetClsClassIdName)
if !ok {
return 0, ErrResourceNotRegistered
}
return readCgroupAndParseUint64(parentDir, resource)
return readCgroupAndParseUint32(parentDir, resource)
}

func NewCgroupReader() CgroupReader {
Expand Down
4 changes: 2 additions & 2 deletions pkg/koordlet/runtimehooks/hooks/tc/rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ func (p *tcPlugin) ruleUpdateCbForPod(target *statesinformer.CallbackTarget) err
if err != nil || netClsId == 0 {
continue
}
r.uidToHandle[pod.Pod.UID] = uint32(netClsId)
r.handleToUid[uint32(netClsId)] = pod.Pod.UID
r.uidToHandle[pod.Pod.UID] = netClsId
r.handleToUid[netClsId] = pod.Pod.UID
p.updateRule(r)
}
})
Expand Down