ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Don't redundantly filepath.Clean the output of filepath.Join

Browse Source 
filepath.Join is already specified to clean its output,
and the implementation indeed does so.

Signed-off-by: edef <edef@edef.eu>
This commit is contained in:
edef 2021-09-17 14:10:16 +00:00
parent a6b5412c55
commit ceb34eb2e6
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/utils/sysctl/sysctl_linux.go
View File

@ -36,7 +36,6 @@ func Sysctl(name string, params ...string) (string, error) {
func getSysctl(name string) (string, error) { func getSysctl(name string) (string, error) {
fullName := filepath.Join("/proc/sys", toNormalName(name)) fullName := filepath.Join("/proc/sys", toNormalName(name))
fullName = filepath.Clean(fullName)
data, err := ioutil.ReadFile(fullName) data, err := ioutil.ReadFile(fullName)
if err != nil { if err != nil {
return "", err return "", err
@ -47,7 +46,6 @@ func getSysctl(name string) (string, error) {
func setSysctl(name, value string) (string, error) { func setSysctl(name, value string) (string, error) {
fullName := filepath.Join("/proc/sys", toNormalName(name)) fullName := filepath.Join("/proc/sys", toNormalName(name))
fullName = filepath.Clean(fullName)
if err := ioutil.WriteFile(fullName, []byte(value), 0644); err != nil { if err := ioutil.WriteFile(fullName, []byte(value), 0644); err != nil {
return "", err return "", err
} }

2
plugins/meta/tuning/tuning.go
View File

@ -326,7 +326,6 @@ func cmdAdd(args *skel.CmdArgs) error {
err = ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error { err = ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
for key, value := range tuningConf.SysCtl { for key, value := range tuningConf.SysCtl {
fileName := filepath.Join("/proc/sys", strings.Replace(key, ".", "/", -1)) fileName := filepath.Join("/proc/sys", strings.Replace(key, ".", "/", -1))
fileName = filepath.Clean(fileName)
// Refuse to modify sysctl parameters that don't belong // Refuse to modify sysctl parameters that don't belong
// to the network subsystem. // to the network subsystem.
@ -428,7 +427,6 @@ func cmdCheck(args *skel.CmdArgs) error {
// Check each configured value vs what's currently in the container // Check each configured value vs what's currently in the container
for key, confValue := range tuningConf.SysCtl { for key, confValue := range tuningConf.SysCtl {
fileName := filepath.Join("/proc/sys", strings.Replace(key, ".", "/", -1)) fileName := filepath.Join("/proc/sys", strings.Replace(key, ".", "/", -1))
fileName = filepath.Clean(fileName)
contents, err := ioutil.ReadFile(fileName) contents, err := ioutil.ReadFile(fileName)
if err != nil { if err != nil {