feta: 支持unshare接口

BREAKING CHANGE:
支持unshare接口对外变更
1.支持unshare接口,flags支持:CLONE_NEWPID, CLONE_NEWTIME, CLONE_NEWUTS

Close #I6BE5A

Signed-off-by: zhushengle <zhushengle@huawei.com>
Change-Id: Ib61abad2fa03a7100bf808e93830f2094fa1c5a6
This commit is contained in:
zhushengle
2023-01-28 20:16:22 +08:00
parent 1d1f1b06c3
commit 325b4a49e4
31 changed files with 1108 additions and 95 deletions
@@ -74,7 +74,7 @@ EXIT1:
return EXIT_CODE_ERRNO_7;
}
void ItIpcContainer003(void)
static void IpcContainerUnshare(void)
{
int status, exitCode, ret;
int arg = CHILD_FUNC_ARG;
@@ -149,3 +149,15 @@ void ItIpcContainer003(void)
ASSERT_EQ(ret, strlen(msgptr));
ASSERT_STREQ(msgrcd, msgptr);
}
void ItIpcContainer003(void)
{
auto pid = fork();
ASSERT_TRUE(pid != -1);
if (pid == 0) {
IpcContainerUnshare();
exit(0);
}
auto ret = waitpid(pid, NULL, 0);
ASSERT_EQ(ret, pid);
}
@@ -32,7 +32,7 @@
/*
* mount container unshare test: unshare in current pcb with NEW_NS
*/
void ItMntContainer005(void)
static void MntContainerUnshare(void)
{
int ret;
@@ -56,4 +56,22 @@ void ItMntContainer005(void)
ret = access(ACCESS_FILE_NAME, F_OK);
ASSERT_EQ(ret, 0);
exit(0);
}
void ItMntContainer005(void)
{
int status = 0;
auto pid = fork();
ASSERT_TRUE(pid != -1);
if (pid == 0) {
MntContainerUnshare();
exit(EXIT_CODE_ERRNO_1);
}
auto ret = waitpid(pid, &status, 0);
ASSERT_EQ(ret, pid);
ret = WIFEXITED(status);
ASSERT_NE(ret, 0);
ret = WEXITSTATUS(status);
ASSERT_EQ(ret, 0);
}
@@ -0,0 +1,148 @@
/*
* 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 int ChildFunClone3(void *p)
{
(void)p;
auto pid = getpid();
if (pid != CONTAINER_SECOND_PID) {
return EXIT_CODE_ERRNO_1;
}
return 0;
}
static int ChildFunClone2(void *p)
{
(void)p;
auto pid = getpid();
if (pid != CONTAINER_FIRST_PID) {
return EXIT_CODE_ERRNO_1;
}
int ret;
int status;
void *pstk = malloc(STACK_SIZE);
if (pstk == NULL) {
return EXIT_CODE_ERRNO_2;
}
int childPid = clone(ChildFunClone3, (char *)pstk + STACK_SIZE, SIGCHLD, NULL);
if (childPid == -1) {
free(pstk);
return EXIT_CODE_ERRNO_3;
}
ret = waitpid(childPid, &status, 0);
ret = WIFEXITED(status);
ret = WEXITSTATUS(status);
if (ret != 0) {
free(pstk);
return EXIT_CODE_ERRNO_4;
}
free(pstk);
return 0;
}
static int ChildFunClone1(void *p)
{
(void)p;
int ret;
int status;
const char *containerType = "pid";
const char *containerType1 = "pid_for_children";
auto pid = getpid();
ret = unshare(CLONE_NEWPID);
if (ret == -1) {
return EXIT_CODE_ERRNO_1;
}
auto pid1 = getpid();
if (pid != pid1) {
return EXIT_CODE_ERRNO_2;
}
auto linkBuffer = ReadlinkContainer(pid, containerType);
auto linkBuffer1 = ReadlinkContainer(pid, containerType1);
ret = linkBuffer.compare(linkBuffer1);
if (ret == 0) {
printf("linkBuffer: %s linkBuffer1: %s\n", linkBuffer.c_str(), linkBuffer1.c_str());
return EXIT_CODE_ERRNO_3;
}
void *pstk = malloc(STACK_SIZE);
if (pstk == NULL) {
return EXIT_CODE_ERRNO_4;
}
int childPid = clone(ChildFunClone2, (char *)pstk + STACK_SIZE, CLONE_NEWUTS | SIGCHLD, NULL);
free(pstk);
if (childPid == -1) {
return EXIT_CODE_ERRNO_5;
}
ret = unshare(CLONE_NEWPID);
if (ret != -1) {
return EXIT_CODE_ERRNO_6;
}
ret = waitpid(childPid, &status, 0);
if (ret != childPid) {
return EXIT_CODE_ERRNO_7;
}
ret = WIFEXITED(status);
if (ret == 0) {
return EXIT_CODE_ERRNO_8;
}
ret = WEXITSTATUS(status);
if (ret != 0) {
return EXIT_CODE_ERRNO_9;
}
return 0;
}
void ItPidContainer027(void)
{
void *pstk = malloc(STACK_SIZE);
ASSERT_TRUE(pstk != NULL);
pid_t parentPid = getpid();
int childPid = clone(ChildFunClone1, (char *)pstk + STACK_SIZE, SIGCHLD, NULL);
free(pstk);
ASSERT_NE(childPid, -1);
int status;
int ret = waitpid(childPid, &status, 0);
ASSERT_EQ(ret, childPid);
ret = WIFEXITED(status);
ASSERT_NE(ret, 0);
ret = WEXITSTATUS(status);
ASSERT_EQ(ret, 0);
}
@@ -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 int ChildFunClone3(void *p)
{
(void)p;
auto pid = getpid();
if (pid != CONTAINER_SECOND_PID) {
return EXIT_CODE_ERRNO_1;
}
return 0;
}
static int ChildFunClone2(void *p)
{
(void)p;
auto pid = getpid();
if (pid != CONTAINER_FIRST_PID) {
return EXIT_CODE_ERRNO_1;
}
int ret;
int status;
void *pstk = malloc(STACK_SIZE);
if (pstk == NULL) {
return EXIT_CODE_ERRNO_2;
}
int childPid = clone(ChildFunClone3, (char *)pstk + STACK_SIZE, SIGCHLD, NULL);
if (childPid == -1) {
free(pstk);
return EXIT_CODE_ERRNO_3;
}
ret = waitpid(childPid, &status, 0);
ret = WIFEXITED(status);
ret = WEXITSTATUS(status);
if (ret != 0) {
free(pstk);
return EXIT_CODE_ERRNO_4;
}
free(pstk);
return 0;
}
static int ChildFunClone1(void *p)
{
(void)p;
int ret;
int status;
const char *containerType = "pid";
const char *containerType1 = "pid_for_children";
auto pid = getpid();
ret = unshare(CLONE_NEWPID);
if (ret == -1) {
return EXIT_CODE_ERRNO_1;
}
auto pid1 = getpid();
if (pid != pid1) {
return EXIT_CODE_ERRNO_2;
}
auto linkBuffer = ReadlinkContainer(pid, containerType);
auto linkBuffer1 = ReadlinkContainer(pid, containerType1);
ret = linkBuffer.compare(linkBuffer1);
if (ret == 0) {
return EXIT_CODE_ERRNO_3;
}
void *pstk = malloc(STACK_SIZE);
if (pstk == NULL) {
return EXIT_CODE_ERRNO_4;
}
int childPid = clone(ChildFunClone2, (char *)pstk + STACK_SIZE, CLONE_NEWPID | SIGCHLD, NULL);
free(pstk);
if (childPid == -1) {
return EXIT_CODE_ERRNO_5;
}
ret = unshare(CLONE_NEWPID);
if (ret != -1) {
return EXIT_CODE_ERRNO_6;
}
ret = waitpid(childPid, &status, 0);
if (ret != childPid) {
return EXIT_CODE_ERRNO_7;
}
ret = WIFEXITED(status);
if (ret == 0) {
return EXIT_CODE_ERRNO_8;
}
ret = WEXITSTATUS(status);
if (ret != 0) {
return EXIT_CODE_ERRNO_9;
}
return 0;
}
void ItPidContainer028(void)
{
void *pstk = malloc(STACK_SIZE);
ASSERT_TRUE(pstk != NULL);
pid_t parentPid = getpid();
int childPid = clone(ChildFunClone1, (char *)pstk + STACK_SIZE, SIGCHLD, NULL);
free(pstk);
ASSERT_NE(childPid, -1);
int status;
int ret = waitpid(childPid, &status, 0);
ASSERT_EQ(ret, childPid);
ret = WIFEXITED(status);
ASSERT_NE(ret, 0);
ret = WEXITSTATUS(status);
ASSERT_EQ(ret, 0);
}
@@ -67,6 +67,7 @@ static int childFunc(void *arg)
return 0;
}
static int WriteProcTime(int pid)
{
int ret = 0;
@@ -98,7 +99,7 @@ static int WriteProcTime(int pid)
return 0;
}
void ItTimeContainer002(void)
static void TimeContainerUnshare(void)
{
int ret;
int status;
@@ -112,6 +113,9 @@ void ItTimeContainer002(void)
ret = unshare(CLONE_NEWTIME);
ASSERT_EQ(ret, 0);
ret = unshare(CLONE_NEWTIME);
ASSERT_EQ(ret, -1);
ret = WriteProcTime(getpid());
ASSERT_EQ(ret, 0);
@@ -128,6 +132,9 @@ void ItTimeContainer002(void)
ret = linkBuffer1.compare(linkBuffer2);
ASSERT_EQ(ret, 0);
ret = unshare(CLONE_NEWTIME);
ASSERT_EQ(ret, -1);
ret = waitpid(pid, &status, 0);
ASSERT_EQ(ret, pid);
@@ -136,4 +143,23 @@ void ItTimeContainer002(void)
int exitCode = WEXITSTATUS(status);
ASSERT_EQ(exitCode, 0);
exit(0);
}
void ItTimeContainer002(void)
{
int status = 0;
auto pid = fork();
ASSERT_TRUE(pid != -1);
if (pid == 0) {
TimeContainerUnshare();
exit(EXIT_CODE_ERRNO_1);
}
auto ret = waitpid(pid, &status, 0);
ASSERT_EQ(ret, pid);
ret = WIFEXITED(status);
ASSERT_NE(ret, 0);
ret = WEXITSTATUS(status);
ASSERT_EQ(ret, 0);
}
@@ -69,7 +69,7 @@ static int childFunc(void *arg)
return 0;
}
void ItTimeContainer003(void)
static void TimeContainerUnshare(void)
{
int ret;
int status;
@@ -97,4 +97,23 @@ void ItTimeContainer003(void)
int exitCode = WEXITSTATUS(status);
ASSERT_EQ(exitCode, 0);
exit(0);
}
void ItTimeContainer003(void)
{
int status = 0;
auto pid = fork();
ASSERT_TRUE(pid != -1);
if (pid == 0) {
TimeContainerUnshare();
exit(EXIT_CODE_ERRNO_1);
}
auto ret = waitpid(pid, &status, 0);
ASSERT_EQ(ret, pid);
ret = WIFEXITED(status);
ASSERT_NE(ret, 0);
ret = WEXITSTATUS(status);
ASSERT_EQ(ret, 0);
}
@@ -81,7 +81,7 @@ static int WriteProcTime(int pid)
return 0;
}
void ItTimeContainer004(void)
static void TimeContainerUnshare(void)
{
int ret;
int status;
@@ -111,4 +111,23 @@ void ItTimeContainer004(void)
int exitCode = WEXITSTATUS(status);
ASSERT_EQ(exitCode, 0);
exit(0);
}
void ItTimeContainer004(void)
{
int status = 0;
auto pid = fork();
ASSERT_TRUE(pid != -1);
if (pid == 0) {
TimeContainerUnshare();
exit(EXIT_CODE_ERRNO_1);
}
auto ret = waitpid(pid, &status, 0);
ASSERT_EQ(ret, pid);
ret = WIFEXITED(status);
ASSERT_NE(ret, 0);
ret = WEXITSTATUS(status);
ASSERT_EQ(ret, 0);
}
@@ -81,7 +81,7 @@ static int WriteProcTime(int pid)
return 0;
}
void ItTimeContainer005(void)
static void TimeContainerUnshare(void)
{
int ret;
int status;
@@ -111,4 +111,23 @@ void ItTimeContainer005(void)
int exitCode = WEXITSTATUS(status);
ASSERT_EQ(exitCode, 0);
exit(0);
}
void ItTimeContainer005(void)
{
int status = 0;
auto pid = fork();
ASSERT_TRUE(pid != -1);
if (pid == 0) {
TimeContainerUnshare();
exit(EXIT_CODE_ERRNO_1);
}
auto ret = waitpid(pid, &status, 0);
ASSERT_EQ(ret, pid);
ret = WIFEXITED(status);
ASSERT_NE(ret, 0);
ret = WEXITSTATUS(status);
ASSERT_EQ(ret, 0);
}
@@ -63,11 +63,30 @@ static int WriteProcTime(int pid)
return 0;
}
void ItTimeContainer008(void)
static void TimeContainerUnshare(void)
{
int ret = unshare(CLONE_NEWTIME);
ASSERT_EQ(ret, 0);
ret = WriteProcTime(getpid());
ASSERT_EQ(ret, 0);
exit(0);
}
void ItTimeContainer008(void)
{
int status = 0;
auto pid = fork();
ASSERT_TRUE(pid != -1);
if (pid == 0) {
TimeContainerUnshare();
exit(EXIT_CODE_ERRNO_1);
}
auto ret = waitpid(pid, &status, 0);
ASSERT_EQ(ret, pid);
ret = WIFEXITED(status);
ASSERT_NE(ret, 0);
ret = WEXITSTATUS(status);
ASSERT_EQ(ret, 0);
}
@@ -0,0 +1,97 @@
/*
* 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"
#include "sys/utsname.h"
static int ChildFunc(void *arg)
{
(void)arg;
int ret;
ret = unshare(CLONE_NEWUTS);
if (ret != 0) {
return EXIT_CODE_ERRNO_1;
}
struct utsname newName;
ret = uname(&newName);
if (ret != 0) {
return EXIT_CODE_ERRNO_2;
}
const char *name = "TestHostName";
ret = sethostname(name, strlen(name));
if (ret != 0) {
return EXIT_CODE_ERRNO_3;
}
struct utsname newName1;
ret = uname(&newName1);
if (ret != 0) {
return EXIT_CODE_ERRNO_4;
}
ret = strcmp(newName.nodename, newName1.nodename);
if (ret == 0) {
return EXIT_CODE_ERRNO_5;
}
return 0;
}
void ItUtsContainer004(void)
{
int ret;
char *stack = (char *)mmap(NULL, STACK_SIZE, PROT_READ | PROT_WRITE, CLONE_STACK_MMAP_FLAG, -1, 0);
ASSERT_TRUE(stack != NULL);
char *stackTop = stack + STACK_SIZE;
struct utsname oldName;
ret = uname(&oldName);
ASSERT_EQ(ret, 0);
auto pid = clone(ChildFunc, stackTop, SIGCHLD, NULL);
(void)munmap(stack, STACK_SIZE);
ASSERT_NE(pid, -1);
int status;
ret = waitpid(pid, &status, 0);
ASSERT_EQ(ret, pid);
int exitCode = WEXITSTATUS(status);
ASSERT_EQ(exitCode, 0);
struct utsname oldName1;
ret = uname(&oldName1);
ASSERT_EQ(ret, 0);
ret = strcmp(oldName.nodename, oldName1.nodename);
ASSERT_EQ(ret, 0);
}