Skip to contentSkip to conversation

include/tst_cgroup.h: Replace hardcoded cgroup paths

PATCH New Bogdan Lezhepekov 2 participants 3 messages Dec 30, 2020 – Dec 31, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 include/tst_cgroup.h: Replace hardcoded cgroup paths

Macros PATH_TMP_CG_CST and PATH_TMP_CG_MEM defined cgroup temporary directory paths to be in /tmp that can be a mount point.

Enable an option to set PATH_TMP_CG_CST and PATH_TMP_CG_MEM through TMPDIR environment variable keeping old paths as default ones.

---
 include/tst_cgroup.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
include/tst_cgroup.h +3 -2
index bfd848260..0f7db5487 100644
@@ -7,8 +7,9 @@
 #ifndef TST_CGROUP_H
 #define TST_CGROUP_H
 
-#define PATH_TMP_CG_MEM	"/tmp/cgroup_mem"
-#define PATH_TMP_CG_CST	"/tmp/cgroup_cst"
+#define PATH_BASE (getenv("TMPDIR") ? getenv("TMPDIR") : "/tmp")
+#define PATH_TMP_CG_CST (strcat(PATH_BASE, "/cgroup_cst"))
+#define PATH_TMP_CG_MEM (strcat(PATH_BASE, "/cgroup_mem"))
 
 enum tst_cgroup_ver {
 	TST_CGROUP_V1 = 1,
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/1 include/tst_cgroup.h: Replace hardcoded cgroup paths

Hi Bogdan,

Quoted 16 lines · Bogdan Lezhepekov via ltp

Macros PATH_TMP_CG_CST and PATH_TMP_CG_MEM defined cgroup temporary directory paths to be in /tmp that can be a mount point.

Enable an option to set PATH_TMP_CG_CST and PATH_TMP_CG_MEM through TMPDIR environment variable keeping old paths as default ones.

---
 include/tst_cgroup.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
include/tst_cgroup.h +0 -0
index bfd848260..0f7db5487 100644

include/tst_cgroup.h line 13

Quoted 9 lines
include/tst_cgroup.h +3 -2
@@ -7,8 +7,9 @@
 #ifndef TST_CGROUP_H
 #define TST_CGROUP_H
 
-#define PATH_TMP_CG_MEM        "/tmp/cgroup_mem"
-#define PATH_TMP_CG_CST        "/tmp/cgroup_cst"
+#define PATH_BASE (getenv("TMPDIR") ? getenv("TMPDIR") : "/tmp")
+#define PATH_TMP_CG_CST (strcat(PATH_BASE, "/cgroup_cst"))
+#define PATH_TMP_CG_MEM (strcat(PATH_BASE, "/cgroup_mem"))
 

As described on strcat() manual page, the potential risk is that buffer overruns might cause an unpredictable problem.

I won't like to merge this patch because, Richard raised a new method to refactor the whole CGroup API. And the patchset is pending on reviewing.

http://lists.linux.it/pipermail/ltp/2020-December/020274.html

Signature · 5 lines
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20201231/19f96021/attachment.htm>
#2 lore raw

PATCH 1/1 include/tst_cgroup.h: Replace hardcoded cgroup paths

Hi Li,

Thanks for the review and pointing to the Richard's update, haven't seen that before. Regards,
Bogdan

Quoted 32 lines · Li Wang

Hi Bogdan,

Quoted 16 lines · Bogdan Lezhepekov via ltp

Macros PATH_TMP_CG_CST and PATH_TMP_CG_MEM defined cgroup temporary directory paths to be in /tmp that can be a mount point.

Enable an option to set PATH_TMP_CG_CST and PATH_TMP_CG_MEM through TMPDIR environment variable keeping old paths as default ones.

Signed-off-by Bogdan Lezhepekov <[email protected] (mailto:[email protected])>

---
include/tst_cgroup.h | 5 +++--

1 file changed, 3 insertions(+), 2 deletions(-)
include/tst_cgroup.h +0 -0
index bfd848260..0f7db5487 100644

include/tst_cgroup.h line 12

Quoted 8 lines
include/tst_cgroup.h +3 -2
@@ -7,8 +7,9 @@
 #ifndef TST_CGROUP_H
 #define TST_CGROUP_H
 
-#define PATH_TMP_CG_MEM "/tmp/cgroup_mem"
-#define PATH_TMP_CG_CST "/tmp/cgroup_cst"
+#define PATH_BASE (getenv("TMPDIR") ? getenv("TMPDIR") : "/tmp")
+#define PATH_TMP_CG_CST (strcat(PATH_BASE, "/cgroup_cst"))
+#define PATH_TMP_CG_MEM (strcat(PATH_BASE, "/cgroup_mem"))

As described on strcat() manual page, the potential risk is that buffer overruns might cause an unpredictable problem.

Quoted 12 lines

I won't like to merge this patch because, Richard raised a new method to refactor the whole CGroup API. And the patchset is pending on reviewing.

http://lists.linux.it/pipermail/ltp/2020-December/020274.html

--
Regards,

Li Wang

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20201231/3a4f3ac0/attachment.htm>