mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge branch 'pr-2636'

Browse Source 
Kenta Tada (1):
  libcontainer/intelrdt: adjust the file mode

LGTMs: @AkihiroSuda @cyphar
Closes #2636
This commit is contained in:
Aleksa Sarai
2021-02-01 20:50:25 +11:00
parent 2046f264ca 25987d03e3
commit 4074b47975
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/intelrdt/intelrdt.go
+3 -3
View File
@@ -413,7 +413,7 @@ func writeFile(dir, file, data string) error {
if dir == "" {
return fmt.Errorf("no such directory for %s", file)
}
if err := ioutil.WriteFile(filepath.Join(dir, file), []byte(data+"\n"), 0700); err != nil {
if err := ioutil.WriteFile(filepath.Join(dir, file), []byte(data+"\n"), 0o600); err != nil {
return fmt.Errorf("failed to write %v to %v: %v", data, file, err)
}
return nil
@@ -520,7 +520,7 @@ func WriteIntelRdtTasks(dir string, pid int) error {
// Don't attach any pid if -1 is specified as a pid
if pid != -1 {
if err := ioutil.WriteFile(filepath.Join(dir, IntelRdtTasks), []byte(strconv.Itoa(pid)), 0700); err != nil {
if err := ioutil.WriteFile(filepath.Join(dir, IntelRdtTasks), []byte(strconv.Itoa(pid)), 0o600); err != nil {
return fmt.Errorf("failed to write %v to %v: %v", pid, IntelRdtTasks, err)
}
}
@@ -763,7 +763,7 @@ func (m *intelRdtManager) Set(container *configs.Config) error {
func (raw *intelRdtData) join(id string) (string, error) {
path := filepath.Join(raw.root, id)
if err := os.MkdirAll(path, 0755); err != nil {
if err := os.MkdirAll(path, 0o755); err != nil {
return "", NewLastCmdError(err)
}
libcontainer/intelrdt/util_test.go
+1 -1
View File
@@ -45,7 +45,7 @@ func NewIntelRdtTestUtil(t *testing.T) *intelRdtTestUtil {
}
// Ensure the full mock Intel RDT "resource control" filesystem path exists
err = os.MkdirAll(testIntelRdtPath, 0755)
err = os.MkdirAll(testIntelRdtPath, 0o755)
if err != nil {
t.Fatal(err)
}