Skip to contentSkip to conversation

cgroup_fj: Check start_path before removing directories in cleanup

PATCH In review Wake Liu via ltp 3 participants 3 messages Aug 28 – Sep 4

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cgroup_fj: Check start_path before removing directories in cleanup

When setup() fails early (for example, when a cgroup controller is not available and cgroup_require triggers TCONF), start_path has not yet been assigned.

In this case, cleanup() in cgroup_fj_function.sh unconditionally runs rmdir "$start_path/ltp_1", which evaluates to rmdir /ltp_1 and fails. Similarly, common_cleanup() prints a message about removing all ltp subgroups even when none were created.

Add checks to verify that start_path is non-empty and the directory exists before attempting removal.

---
 testcases/kernel/controllers/cgroup_fj/cgroup_fj_common.sh | 7 ++++---
 .../kernel/controllers/cgroup_fj/cgroup_fj_function.sh     | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
testcases/kernel/controllers/cgroup_fj/cgroup_fj_common.sh +4 -3
index 8b5e73466..03e416f55 100755
@@ -79,9 +79,10 @@ common_cleanup()
 {
     killall -9 cgroup_fj_proc >/dev/null 2>&1
 
-    tst_res TINFO "Removing all ltp subgroups..."
-
-    [ -d "$start_path" ] && find "$start_path" -depth -type d -exec rmdir '{}' \;
+    if [ -n "$start_path" ] && [ -d "$start_path" ]; then
+        tst_res TINFO "Removing all ltp subgroups..."
+        find "$start_path" -depth -type d -exec rmdir '{}' \;
+    fi
 
     cgroup_cleanup
 
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh +1 -1
index b0c9410ca..61b7a0415 100755
@@ -231,7 +231,7 @@ cleanup()
         wait $pid >/dev/null 2>&1
     fi
 
-    rmdir "$start_path/ltp_1" >/dev/null 2>&1
+    [ -n "$start_path" ] && [ -d "$start_path/ltp_1" ] && rmdir "$start_path/ltp_1" >/dev/null 2>&1
     common_cleanup
 }
 

--
2.55.0.897.gb25b4bd76c-goog

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw

Hi Wake,

Quoted 1 line · Wake Liu

cgroup_fj: Check start_path before removing directories in cleanup

Verdict - Reviewed

---
Note:

The agent can sometimes produce false positives although often its findings are genuine. If you find issues with the review, please comment this email or ignore the suggestions.

Regards,
LTP AI Reviewer

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw
In reply to Wake Liu via ltp

Hi Wake Liu,

Thanks, merged with minor changes.

Review

Quoted 8 lines

+++ b/testcases/kernel/controllers/cgroup_fj/cgroup_fj_common.sh @@ -79,9 +79,10 @@ common_cleanup() { killall -9 cgroup_fj_proc >/dev/null 2>&1

(quoted diff) +2 -3
-    tst_res TINFO "Removing all ltp subgroups..."
-
-    [ -d "$start_path" ] && find "$start_path" -depth -type d -exec rmdir '{}' \;
+    if [ -n "$start_path" ] && [ -d "$start_path" ]; then
+        tst_res TINFO "Removing all ltp subgroups..."

Let's remove dots.

Quoted 10 lines
(quoted diff) +2 -0
+        find "$start_path" -depth -type d -exec rmdir '{}' \;
+    fi
 
     cgroup_cleanup
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh +0 -0
index b0c9410ca..61b7a0415 100755

testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh cleanup() · line 234

Quoted 5 lines
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh +1 -1
@@ -231,7 +231,7 @@ cleanup()
         wait $pid >/dev/null 2>&1
     fi
 
-    rmdir "$start_path/ltp_1" >/dev/null 2>&1
+    [ -n "$start_path" ] && [ -d "$start_path/ltp_1" ] && rmdir "$start_path/ltp_1" >/dev/null 2>&1

Now we don't need to mask errors, right?
And a bit long line.

Also, I'm not sure if ... && ... can't bring problems on 'set -e' setup, because if code is not executed $? gets 1. That's why I use only ... || ... or if/then/else after which $? is always 0.

testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh cleanup() · line 236

Quoted 2 lines
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh +0 -0
     common_cleanup
 }

Merged with following diff.

Kind regards,
Petr

+++ testcases/kernel/controllers/cgroup_fj/cgroup_fj_common.sh @@ -79,9 +79,10 @@ common_cleanup()

 {
     killall -9 cgroup_fj_proc >/dev/null 2>&1

- tst_res TINFO "Removing all ltp subgroups..."
-
- [ -d "$start_path" ] && find "$start_path" -depth -type d -exec rmdir '{}' \;
+ if [ -n "$start_path" ] && [ -d "$start_path" ]; then
+ tst_res TINFO "Removing all ltp subgroups"
+ find "$start_path" -depth -type d -exec rmdir '{}' \;
+ fi

cgroup_cleanup

kernel/controllers/cgroup_fj/cgroup_fj_function.sh +4 -1
index b0c9410ca3..2b0dafc544 100755
@@ -231,7 +231,10 @@ cleanup()
         wait $pid >/dev/null 2>&1
     fi
 
-    rmdir "$start_path/ltp_1" >/dev/null 2>&1
+    if [ -n "$start_path" ] && [ -d "$start_path/ltp_1" ]; then
+        rmdir "$start_path/ltp_1"
+    fi
+
     common_cleanup
 }
 
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp