Skip to content

Commit 9c822e4

Browse files
committed
cgroups/fs: check nil pointers in cgroup manager
Signed-off-by: Erik Sipsma <[email protected]>
1 parent 2e94378 commit 9c822e4

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

libcontainer/cgroups/fs/apply_raw.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,13 @@ func (m *Manager) GetStats() (*cgroups.Stats, error) {
226226
}
227227

228228
func (m *Manager) Set(container *configs.Config) error {
229+
if container.Cgroups == nil {
230+
return nil
231+
}
232+
229233
// If Paths are set, then we are just joining cgroups paths
230234
// and there is no need to set any values.
231-
if m.Cgroups.Paths != nil {
235+
if m.Cgroups != nil && m.Cgroups.Paths != nil {
232236
return nil
233237
}
234238

@@ -262,6 +266,10 @@ func (m *Manager) Set(container *configs.Config) error {
262266
// Freeze toggles the container's freezer cgroup depending on the state
263267
// provided
264268
func (m *Manager) Freeze(state configs.FreezerState) error {
269+
if m.Cgroups == nil {
270+
return errors.New("cannot toggle freezer: cgroups not configured for container")
271+
}
272+
265273
paths := m.GetPaths()
266274
dir := paths["freezer"]
267275
prevState := m.Cgroups.Resources.Freezer

0 commit comments

Comments
 (0)