feat: 支持setns接口

BREAKING CHANGE:
支持setns接口对外变更:
1.新增setns接口

Close #I6D9Y0

Signed-off-by: zhushengle <zhushengle@huawei.com>
Change-Id: I9aacf9e5b8463e8e6c743a0041a5b2b18fdb0e12

testsuites/unittest/container/smoke/It_ipc_container_002.cpp

@@ -118,6 +118,12 @@ void ItIpcContainer002(void)
     ret = mq_send(mqueue, msgptr, strlen(msgptr), 0);
     ASSERT_EQ(ret, 0);
 
+    ret = mq_close(mqueue);
+    ASSERT_EQ(ret, 0);
+
+    ret = mq_unlink(mqname);
+    ASSERT_EQ(ret, 0);
+
     childPid = clone(childFunc, stackTop, CLONE_NEWIPC | SIGCHLD, &arg);
     ASSERT_NE(childPid, -1);
 

testsuites/unittest/container/smoke/It_pid_container_028.cpp

@@ -100,7 +100,7 @@ static int ChildFunClone1(void *p)
     if (pstk == NULL) {
         return EXIT_CODE_ERRNO_4;
     }
-    int childPid = clone(ChildFunClone2, (char *)pstk + STACK_SIZE, CLONE_NEWPID | SIGCHLD, NULL);
+    int childPid = clone(ChildFunClone2, (char *)pstk + STACK_SIZE, SIGCHLD, NULL);
     free(pstk);
     if (childPid == -1) {
         return EXIT_CODE_ERRNO_5;

testsuites/unittest/container/smoke/It_pid_container_029.cpp

@@ -79,12 +79,12 @@ static int ChildFunClone1(void *p)
         return EXIT_CODE_ERRNO_4;
     }
     int childPid = clone(ChildFunClone2, (char *)pstk + STACK_SIZE, CLONE_NEWPID | SIGCHLD, NULL);
-    if (childPid == -1) {
+    if (childPid != -1) {
         free(pstk);
         return EXIT_CODE_ERRNO_5;
     }
 
-    int childPid1 = clone(ChildFunClone3, (char *)pstk + STACK_SIZE, CLONE_NEWPID | SIGCHLD, NULL);
+    int childPid1 = clone(ChildFunClone3, (char *)pstk + STACK_SIZE, SIGCHLD, NULL);
     free(pstk);
     if (childPid1 == -1) {
         return EXIT_CODE_ERRNO_6;
@@ -95,18 +95,6 @@ static int ChildFunClone1(void *p)
         return EXIT_CODE_ERRNO_7;
     }
 
-    ret = waitpid(childPid, &status, 0);
-    if (ret != childPid) {
-        return EXIT_CODE_ERRNO_8;
-    }
-    ret = WIFEXITED(status);
-    if (ret == 0) {
-        return EXIT_CODE_ERRNO_9;
-    }
-    ret = WEXITSTATUS(status);
-    if (ret != 0) {
-        return EXIT_CODE_ERRNO_10;
-    }
     ret = waitpid(childPid1, &status, 0);
     if (ret != childPid1) {
         return EXIT_CODE_ERRNO_11;

testsuites/unittest/container/smoke/It_pid_container_030.cpp

@@ -33,9 +33,10 @@ static int ChildFunClone3(void *p)
 {
     (void)p;
     auto pid = getpid();
-    if (pid == CONTAINER_SECOND_PID) {
+    if (pid != CONTAINER_SECOND_PID) {
         return EXIT_CODE_ERRNO_1;
     }
+    sleep(2); /* dealy 2s */
     return 0;
 }
 
@@ -46,14 +47,14 @@ static int ChildFunClone2(void *p)
     if (pid != CONTAINER_FIRST_PID) {
         return EXIT_CODE_ERRNO_1;
     }
+    sleep(2); /* dealy 2s */
     return 0;
 }
 
 static int ChildFunClone1(void *p)
 {
     (void)p;
-    int ret;
-    int status;
+    int ret, status;
     const char *containerType = "pid";
     const char *containerType1 = "pid_for_children";
 
@@ -78,46 +79,39 @@ static int ChildFunClone1(void *p)
     if (pstk == NULL) {
         return EXIT_CODE_ERRNO_4;
     }
-    int childPid = clone(ChildFunClone2, (char *)pstk + STACK_SIZE, CLONE_NEWPID | SIGCHLD, NULL);
+    int childPid = clone(ChildFunClone2, (char *)pstk + STACK_SIZE, SIGCHLD, NULL);
     if (childPid == -1) {
         free(pstk);
         return EXIT_CODE_ERRNO_5;
     }
 
+    auto linkBuffer2 = ReadlinkContainer(childPid, containerType);
+
     int childPid1 = clone(ChildFunClone3, (char *)pstk + STACK_SIZE, SIGCHLD, NULL);
     free(pstk);
     if (childPid1 == -1) {
         return EXIT_CODE_ERRNO_6;
     }
 
-    ret = unshare(CLONE_NEWPID);
-    if (ret != -1) {
+    auto linkBuffer3 = ReadlinkContainer(childPid1, containerType);
+    ret = linkBuffer3.compare(linkBuffer2);
+    if (ret != 0) {
         return EXIT_CODE_ERRNO_7;
     }
 
-    ret = waitpid(childPid, &status, 0);
-    if (ret != childPid) {
+    ret = unshare(CLONE_NEWPID);
+    if (ret != -1) {
         return EXIT_CODE_ERRNO_8;
     }
-    ret = WIFEXITED(status);
-    if (ret == 0) {
-        return EXIT_CODE_ERRNO_9;
-    }
-    ret = WEXITSTATUS(status);
+
+    ret = WaitChild(childPid1, &status, EXIT_CODE_ERRNO_9, EXIT_CODE_ERRNO_10);
     if (ret != 0) {
-        return EXIT_CODE_ERRNO_10;
+        return ret;
     }
-    ret = waitpid(childPid1, &status, 0);
-    if (ret != childPid1) {
-        return EXIT_CODE_ERRNO_11;
-    }
-    ret = WIFEXITED(status);
-    if (ret == 0) {
-        return EXIT_CODE_ERRNO_12;
-    }
-    ret = WEXITSTATUS(status);
+
+    ret = WaitChild(childPid, &status, EXIT_CODE_ERRNO_11, EXIT_CODE_ERRNO_12);
     if (ret != 0) {
-        return EXIT_CODE_ERRNO_13;
+        return ret;
     }
     return 0;
 }

testsuites/unittest/container/smoke/It_pid_container_031.cpp

@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2023-2023 Huawei Device Co., Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors may be used
+ * to endorse or promote products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "It_container_test.h"
+
+static const int BUF_SIZE = 100;
+
+static int ChildFun2(void *p)
+{
+    (void)p;
+    sleep(3); /* 3: delay 3s */
+    return 0;
+}
+
+static int ChildFun1(void *p)
+{
+    (void)p;
+    sleep(6); /* 6: delay 6s */
+    return 0;
+}
+
+static int ChildFun(void *p)
+{
+    (void)p;
+    int status, ret;
+    const char *containerType = "pid";
+    const char *containerType1 = "pid_for_children";
+    char targetpath[BUF_SIZE] = {0};
+    auto linkBuffer1 = ReadlinkContainer(getpid(), containerType);
+
+    int childPid = clone(ChildFun1, NULL, CLONE_NEWPID | SIGCHLD, NULL);
+    if (childPid == -1) {
+        return EXIT_CODE_ERRNO_1;
+    }
+    auto linkBuffer2 = ReadlinkContainer(childPid, containerType);
+    ret = linkBuffer2.compare(linkBuffer1);
+    if (ret == 0) {
+        return EXIT_CODE_ERRNO_2;
+    }
+
+    ret = sprintf_s(targetpath, BUF_SIZE, "/proc/%d/container/pid", childPid);
+    if (ret < 0) {
+        return EXIT_CODE_ERRNO_16;
+    }
+    int fd = open(targetpath, O_RDONLY | O_CLOEXEC);
+    if (fd == -1) {
+        return EXIT_CODE_ERRNO_3;
+    }
+
+    ret = setns(fd, CLONE_NEWPID);
+    if (ret != 0) {
+        close(fd);
+        return EXIT_CODE_ERRNO_4;
+    }
+
+    close(fd);
+
+    auto linkBuffer6 = ReadlinkContainer(getpid(), containerType);
+    ret = linkBuffer6.compare(linkBuffer1);
+    if (ret != 0) {
+        return EXIT_CODE_ERRNO_17;
+    }
+
+    auto linkBuffer3 = ReadlinkContainer(getpid(), containerType1);
+    ret = linkBuffer3.compare(linkBuffer2);
+    if (ret != 0) {
+        return EXIT_CODE_ERRNO_5;
+    }
+
+    int childPid1 = clone(ChildFun2, NULL, SIGCHLD, NULL);
+    if (childPid1 == -1) {
+        return EXIT_CODE_ERRNO_6;
+    }
+
+    auto linkBuffer4 = ReadlinkContainer(childPid1, containerType);
+    ret = linkBuffer4.compare(linkBuffer3);
+    if (ret != 0) {
+        return EXIT_CODE_ERRNO_7;
+    }
+
+    int childPid2 = clone(ChildFun2, NULL, CLONE_NEWUTS | SIGCHLD, NULL);
+    if (childPid2 == -1) {
+        return EXIT_CODE_ERRNO_8;
+    }
+
+    auto linkBuffer5 = ReadlinkContainer(childPid2, containerType);
+    ret = linkBuffer5.compare(linkBuffer4);
+    if (ret != 0) {
+        return EXIT_CODE_ERRNO_9;
+    }
+
+    ret = WaitChild(childPid2, &status, EXIT_CODE_ERRNO_10, EXIT_CODE_ERRNO_11);
+    if (ret != 0) {
+        return ret;
+    }
+
+    ret = WaitChild(childPid1, &status, EXIT_CODE_ERRNO_12, EXIT_CODE_ERRNO_13);
+    if (ret != 0) {
+        return ret;
+    }
+    ret = WaitChild(childPid, &status, EXIT_CODE_ERRNO_14, EXIT_CODE_ERRNO_15);
+    if (ret != 0) {
+        return ret;
+    }
+    return 0;
+}
+
+void ItPidContainer031(void)
+{
+    int status;
+    int childPid = clone(ChildFun, NULL, CLONE_NEWPID | SIGCHLD, NULL);
+    ASSERT_NE(childPid, -1);
+
+    int ret = waitpid(childPid, &status, 0);
+    ASSERT_EQ(ret, childPid);
+    ret = WIFEXITED(status);
+    ASSERT_NE(ret, 0);
+    ret = WEXITSTATUS(status);
+    ASSERT_EQ(ret, 0);
+}

testsuites/unittest/container/smoke/It_uts_container_005.cpp

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2023-2023 Huawei Device Co., Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors may be used
+ * to endorse or promote products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "It_container_test.h"
+
+const int TIMER_INTERVAL_3S = 2;
+
+static int ChildFun(void *p)
+{
+    (void)p;
+    sleep(TIMER_INTERVAL_3S);
+    return EXIT_CODE_ERRNO_3;
+}
+
+void ItUtsContainer005(void)
+{
+    pid_t callerPid;
+    int childPid;
+    int fd = -1;
+    int ret;
+    int status;
+    int setFlag;
+    char targetpath[100];
+    char old_uts_link[100];
+    char new_uts_link[100];
+    const char *containerType = "uts";
+
+    callerPid = getpid();
+    childPid = clone(ChildFun, NULL, CLONE_NEWUTS | SIGCHLD, NULL);
+    ASSERT_NE(childPid, -1);
+
+    auto linkBuffer = ReadlinkContainer(callerPid, containerType);
+    ASSERT_TRUE(linkBuffer.c_str() != NULL);
+    ret = sprintf_s(old_uts_link, sizeof(old_uts_link), "%s", linkBuffer.c_str());
+    ASSERT_NE(ret, -1);
+
+    ret = sprintf_s(targetpath, sizeof(targetpath), "/proc/%d/container/uts", childPid);
+    ASSERT_NE(ret, -1);
+    fd = open(targetpath, O_RDONLY | O_CLOEXEC);
+    ASSERT_NE(fd, -1);
+
+    setFlag = CLONE_NEWUTS;
+    ret = setns(fd, setFlag);
+    ASSERT_NE(ret, -1);
+
+    /* NOTE: close fd, otherwise test fail */
+    ret = close(fd);
+    fd = -1;
+    ASSERT_NE(ret, -1);
+
+    linkBuffer = ReadlinkContainer(callerPid, containerType);
+
+    ret = sprintf_s(new_uts_link, sizeof(new_uts_link), "%s", linkBuffer.c_str());
+    ASSERT_NE(ret, -1);
+    ASSERT_STRNE(old_uts_link, new_uts_link);
+
+    ret = waitpid(childPid, &status, 0);
+    ASSERT_EQ(ret, childPid);
+
+    int exitCode = WEXITSTATUS(status);
+    ASSERT_EQ(exitCode, EXIT_CODE_ERRNO_3);
+
+    ret = setns(fd, setFlag);
+    ASSERT_EQ(ret, -1);
+}

testsuites/unittest/container/smoke/It_uts_container_006.cpp

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2023-2023 Huawei Device Co., Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors may be used
+ * to endorse or promote products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "It_container_test.h"
+
+void ItUtsContainer006(void)
+{
+    std::string containerType = "uts";
+
+    int parentPid = getpid();
+    auto parentlink = ReadlinkContainer(parentPid, containerType);
+
+    int childsPid = CloneWrapper(ChildFunction, CLONE_NEWUTS, NULL);
+    ASSERT_NE(childsPid, -1);
+    auto childlink = ReadlinkContainer(childsPid, containerType);
+
+    std::string filePath = GenContainerLinkPath(childsPid, containerType);
+    int fd = open(filePath.c_str(), O_RDONLY);
+    ASSERT_NE(fd, -1);
+
+    int ret = setns(fd, CLONE_NEWUTS);
+    ASSERT_NE(ret, -1);
+    (void)close(fd);
+
+    auto parentlink1 = ReadlinkContainer(parentPid, containerType);
+
+    ret = parentlink.compare(parentlink1);
+    ASSERT_NE(ret, 0);
+    ret = parentlink1.compare(childlink);
+    ASSERT_EQ(ret, 0);
+
+    int status;
+    ret = waitpid(childsPid, &status, 0);
+    ASSERT_EQ(ret, childsPid);
+
+    int exitCode = WEXITSTATUS(status);
+    ASSERT_EQ(exitCode, 0);
+}