未验证 提交 e9260e86 编写于 作者: O openharmony_ci 提交者: Gitee

!3633 OH主干编译问题解决上库

Merge pull request !3633 from 胡吉翔/liteOS_OHMaster_20220620_2
...@@ -803,7 +803,7 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest1500, Reliability | MediumTest | Lev ...@@ -803,7 +803,7 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest1500, Reliability | MediumTest | Lev
0, sizeof(struct __user_cap_header_struct)); 0, sizeof(struct __user_cap_header_struct));
if (result != EOK) { if (result != EOK) {
LOG("CapgetWithAllCap memset_s failed"); LOG("CapgetWithAllCap memset_s failed");
return FALSE; ASSERT_TRUE(false);
}; };
capheader.version = _LINUX_CAPABILITY_VERSION_3; capheader.version = _LINUX_CAPABILITY_VERSION_3;
capheader.pid = 0; capheader.pid = 0;
...@@ -812,7 +812,7 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest1500, Reliability | MediumTest | Lev ...@@ -812,7 +812,7 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest1500, Reliability | MediumTest | Lev
LINUX_FULL_CAP, CAP_NUM * sizeof(struct __user_cap_data_struct)); LINUX_FULL_CAP, CAP_NUM * sizeof(struct __user_cap_data_struct));
if (result != EOK) { if (result != EOK) {
LOG("CapgetWithAllCap memset_s failed"); LOG("CapgetWithAllCap memset_s failed");
return FALSE; ASSERT_TRUE(false);
}; };
capdata[CAP_TO_INDEX(INVALID_CAP_TO_INDEX)].permitted &= ~CAP_TO_MASK(INVALID_CAP_TO_INDEX); capdata[CAP_TO_INDEX(INVALID_CAP_TO_INDEX)].permitted &= ~CAP_TO_MASK(INVALID_CAP_TO_INDEX);
capdata[CAP_TO_INDEX(INVALID_CAP_TO_INDEX)].effective &= ~CAP_TO_MASK(INVALID_CAP_TO_INDEX); capdata[CAP_TO_INDEX(INVALID_CAP_TO_INDEX)].effective &= ~CAP_TO_MASK(INVALID_CAP_TO_INDEX);
...@@ -1138,7 +1138,7 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest2300, Security | MediumTest | Level1 ...@@ -1138,7 +1138,7 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest2300, Security | MediumTest | Level1
0, sizeof(struct __user_cap_header_struct)); 0, sizeof(struct __user_cap_header_struct));
if (result != EOK) { if (result != EOK) {
LOG("CapgetWithAllCap memset_s failed"); LOG("CapgetWithAllCap memset_s failed");
return FALSE; ASSERT_TRUE(false);
}; };
capheader.version = _LINUX_CAPABILITY_VERSION_3; capheader.version = _LINUX_CAPABILITY_VERSION_3;
struct __user_cap_data_struct capdataget[CAP_NUM] = { { 0 }, { 0 } }; struct __user_cap_data_struct capdataget[CAP_NUM] = { { 0 }, { 0 } };
...@@ -1146,7 +1146,7 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest2300, Security | MediumTest | Level1 ...@@ -1146,7 +1146,7 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest2300, Security | MediumTest | Level1
0, CAP_NUM * sizeof(struct __user_cap_data_struct)); 0, CAP_NUM * sizeof(struct __user_cap_data_struct));
if (result != EOK) { if (result != EOK) {
LOG("CapgetWithAllCap memset_s failed"); LOG("CapgetWithAllCap memset_s failed");
return FALSE; ASSERT_TRUE(false);
}; };
pid_t pid = getpid(); pid_t pid = getpid();
for (int num = OTHER_PID; num <= pid; num++) { for (int num = OTHER_PID; num <= pid; num++) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册