Merge pull request from GHSA-7ww5-4wqc-m92c

[release/1.6 backport] deny /sys/devices/virtual/powercap
containerd · Dec 8, 2023 · 746b910 · 746b910
2 parents e7ca005 + 02f07fe
commit 746b910
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/contrib/apparmor/template.go b/contrib/apparmor/template.go
@@ -81,6 +81,7 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
   deny /sys/fs/c[^g]*/** wklx,
   deny /sys/fs/cg[^r]*/** wklx,
   deny /sys/firmware/** rwklx,
+  deny /sys/devices/virtual/powercap/** rwklx,
   deny /sys/kernel/security/** rwklx,
 
 {{if ge .Version 208095}}

diff --git a/oci/spec.go b/oci/spec.go
@@ -189,6 +189,7 @@ func populateDefaultUnixSpec(ctx context.Context, s *Spec, id string) error {
 				"/proc/timer_stats",
 				"/proc/sched_debug",
 				"/sys/firmware",
+				"/sys/devices/virtual/powercap",
 				"/proc/scsi",
 			},
 			ReadonlyPaths: []string{