yystopf/openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 内核告警修复

Browse Source 
【背景】
经代码扫描工具检测,内核代码中存在
可以修复的告警

【修改方案】
1.将单语句的if, while等加上括号
2.将C语言风格的类型转换变为C++风格

【影响】
对现有的产品编译不会有影响。

Signed-off-by: yinjiaming <yinjiaming@huawei.com>
Change-Id: I7d4a04a8904abb3c33e843049bf15f4386d3efd8
This commit is contained in:
yinjiaming
2022-09-09 11:50:48 +08:00
parent 71e51d8813
commit 96b2d557ac
155 changed files with 532 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
testsuites/unittest/security/reugid/smoke/reugid_test_001.cpp
View File

@@ -51,10 +51,11 @@ static int Child1(int *list, int listSize)
egid = getegid();
ICUNIT_ASSERT_EQUAL(egid, 300, egid);
ret = getresgid((gid_t *)&ruid, (gid_t *)&euid, (gid_t *)&suid);
ret = getresgid(reinterpret_cast<gid_t *>(&ruid), reinterpret_cast<gid_t *>(&euid),
reinterpret_cast<gid_t *>(&suid));
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_EQUAL(ruid, 300, ruid);
ICUNIT_ASSERT_EQUAL(euid, 300, euid);
ICUNIT_ASSERT_EQUAL(ruid, 300, ruid); // 300: expected ruid
ICUNIT_ASSERT_EQUAL(euid, 300, euid); // 300: expected euid
ICUNIT_ASSERT_EQUAL(suid, 300, suid);
ruid = getuid();
@@ -62,29 +63,30 @@ static int Child1(int *list, int listSize)
euid = geteuid();
ICUNIT_ASSERT_EQUAL(euid, 300, euid);
ret = getresuid((gid_t *)&ruid, (gid_t *)&euid, (gid_t *)&suid);
ret = getresuid(reinterpret_cast<gid_t *>(&ruid), reinterpret_cast<gid_t *>(&euid),
reinterpret_cast<gid_t *>(&suid));
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_EQUAL(ruid, 300, ruid);
ICUNIT_ASSERT_EQUAL(ruid, 300, ruid); // 300: expected ruid
ICUNIT_ASSERT_EQUAL(euid, 300, euid);
ICUNIT_ASSERT_EQUAL(suid, 300, suid);
int size = getgroups(0, (gid_t *)getList);
int size = getgroups(0, reinterpret_cast<gid_t *>(getList));
ICUNIT_ASSERT_EQUAL(size, listSize, size);
size = getgroups(size, (gid_t *)getList);
size = getgroups(size, reinterpret_cast<gid_t *>(getList));
ICUNIT_ASSERT_EQUAL(size, listSize, size);
for (int i = 0; i < size - 1; i++) {
ICUNIT_ASSERT_EQUAL(getList[i], list[i], getList[i]);
}
getList[size - 1] = 500;
ret = setgroups(0, (gid_t *)getList);
ret = setgroups(0, reinterpret_cast<gid_t *>(getList));
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = getgroups(0, NULL);
ICUNIT_ASSERT_EQUAL(ret, 1, ret);
ret = getgroups(ret, (gid_t *)getList);
ret = getgroups(ret, reinterpret_cast<gid_t *>(getList));
ICUNIT_ASSERT_EQUAL(ret, 1, ret);
ICUNIT_ASSERT_EQUAL(getList[0], getgid(), getList[0]);
@@ -109,7 +111,7 @@ static int Child(void)
ret = getgid();
ICUNIT_ASSERT_EQUAL(ret, 3000, ret);
ret = getegid();
ICUNIT_ASSERT_EQUAL(ret, 3000, ret);
ICUNIT_ASSERT_EQUAL(ret, 3000, ret); // 3000: expected egid
ret = setegid(3000);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
@@ -125,50 +127,50 @@ static int Child(void)
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ICUNIT_ASSERT_EQUAL(EINVAL, errno, errno);
list[0] = 1000;
list[1] = 2000;
list[2] = 3000;
list[3] = 4000;
list[4] = 5000;
ret = setgroups(5, (gid_t *)list);
list[0] = 1000; // 1000: preset value of list[0]
list[1] = 2000; // 2000: preset value of list[1]
list[2] = 3000; // 3000: preset value of list[2]
list[3] = 4000; // 4000: preset value of list[3]
list[4] = 5000; // 5000: preset value of list[4]
ret = setgroups(5, reinterpret_cast<gid_t *>(list)); // 5: set groupid for testing
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
size = getgroups(0, (gid_t *)getList);
size = getgroups(0, reinterpret_cast<gid_t *>(getList));
ICUNIT_ASSERT_EQUAL(size, 5, size);
size = getgroups(size, (gid_t *)getList);
size = getgroups(size, reinterpret_cast<gid_t *>(getList));
ICUNIT_ASSERT_EQUAL(size, 5, size);
for (int i = 0; i < size; i++) {
ICUNIT_ASSERT_EQUAL(getList[i], list[i], getList[i]);
}
list[0] = 1000;
list[1] = 2000;
list[2] = 6000;
list[3] = 4000;
list[4] = 5000;
list[0] = 1000; // 1000: preset value of list[0]
list[1] = 2000; // 2000: preset value of list[1]
list[2] = 6000; // 6000: preset value of list[2]
list[3] = 4000; // 4000: preset value of list[3]
list[4] = 5000; // 5000: preset value of list[4]
list[5] = -1;
ret = setgroups(6, (gid_t *)list);
ret = setgroups(6, reinterpret_cast<gid_t *>(list)); // 6: set groupid for testing
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ICUNIT_ASSERT_EQUAL(EINVAL, errno, errno);
list[0] = 1000;
list[1] = 2000;
list[2] = 6000;
list[3] = 4000;
list[4] = 5000;
list[0] = 1000; // 1000: preset value of list[0]
list[1] = 2000; // 2000: preset value of list[1]
list[2] = 6000; // 6000: preset value of list[2]
list[3] = 4000; // 4000: preset value of list[3]
list[4] = 5000; // 5000: preset value of list[4]
list[5] = 7000;
ret = setgroups(6, (gid_t *)list);
ret = setgroups(6, reinterpret_cast<gid_t *>(list)); // 6: set groupid for testing
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
size = getgroups(0, (gid_t *)getList);
size = getgroups(0, reinterpret_cast<gid_t *>(getList));
ICUNIT_ASSERT_EQUAL(size, 7, size);
size = getgroups(0, NULL);
ICUNIT_ASSERT_EQUAL(size, 7, size);
size = getgroups(size, (gid_t *)getList);
size = getgroups(size, reinterpret_cast<gid_t *>(getList));
ICUNIT_ASSERT_EQUAL(size, 7, size);
for (int i = 0; i < size - 1; i++) {
ICUNIT_ASSERT_EQUAL(getList[i], list[i], getList[i]);
@@ -180,7 +182,7 @@ static int Child(void)
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = geteuid();
ICUNIT_ASSERT_EQUAL(ret, 8000, ret);
ICUNIT_ASSERT_EQUAL(ret, 8000, ret); // 8000: expected value of euid
ret = setuid(2000);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
@@ -203,16 +205,16 @@ static int Child(void)
ret = setregid(5000, 5000);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = getgid();
ICUNIT_ASSERT_EQUAL(ret, 5000, ret);
ICUNIT_ASSERT_EQUAL(ret, 5000, ret); // 5000: expected value of gid
egid = getegid();
ICUNIT_ASSERT_EQUAL(egid, 5000, egid);
ICUNIT_ASSERT_EQUAL(egid, 5000, egid); // 5000: expected value of egid
ret = setregid(5000, -1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = getgid();
ICUNIT_ASSERT_EQUAL(ret, 5000, ret);
ICUNIT_ASSERT_EQUAL(ret, 5000, ret); // 5000: expected value of gid
egid = getegid();
ICUNIT_ASSERT_EQUAL(egid, 5000, egid);
ICUNIT_ASSERT_EQUAL(egid, 5000, egid); // 5000: expected value of egid
ret = setregid(3000, -2);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
@@ -225,9 +227,9 @@ static int Child(void)
ret = setregid(3000, -1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = getgid();
ICUNIT_ASSERT_EQUAL(ret, 3000, ret);
ICUNIT_ASSERT_EQUAL(ret, 3000, ret); // 3000: expected value of gid
egid = getegid();
ICUNIT_ASSERT_EQUAL(egid, 3000, egid);
ICUNIT_ASSERT_EQUAL(egid, 3000, egid); // 3000: expected value of egid
ret = setreuid(1000, 3000);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
@@ -244,23 +246,24 @@ static int Child(void)
ret = setreuid(-1, 3000);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ruid = getuid();
ICUNIT_ASSERT_EQUAL(ruid, 3000, ruid);
ICUNIT_ASSERT_EQUAL(ruid, 3000, ruid); // 3000: expected value of ruid
euid = geteuid();
ICUNIT_ASSERT_EQUAL(euid, 3000, euid);
ICUNIT_ASSERT_EQUAL(euid, 3000, euid); // 3000: expected value of euid
ret = setreuid(1000, -1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ruid = getuid();
ICUNIT_ASSERT_EQUAL(ruid, 1000, ruid);
ICUNIT_ASSERT_EQUAL(ruid, 1000, ruid); // 1000: expected value of ruid
euid = geteuid();
ICUNIT_ASSERT_EQUAL(euid, 1000, euid);
ICUNIT_ASSERT_EQUAL(euid, 1000, euid); // 1000: expected value of euid
ret = setresuid(100, 100, 100);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = getresuid((uid_t *)&ruid, (uid_t *)&euid, (uid_t *)&suid);
ret = getresuid(reinterpret_cast<uid_t *>(&ruid), reinterpret_cast<uid_t *>(&euid),
reinterpret_cast<uid_t *>(&suid));
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_EQUAL(ruid, 100, ruid);
ICUNIT_ASSERT_EQUAL(euid, 100, euid);
ICUNIT_ASSERT_EQUAL(euid, 100, euid); // 100: expected value of euid
ICUNIT_ASSERT_EQUAL(suid, 100, suid);
ret = setresuid(200, 100, 100);
@@ -277,18 +280,20 @@ static int Child(void)
ret = setresuid(-1, 200, 200);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = getresuid((uid_t *)&ruid, (uid_t *)&euid, (uid_t *)&suid);
ret = getresuid(reinterpret_cast<uid_t *>(&ruid), reinterpret_cast<uid_t *>(&euid),
reinterpret_cast<uid_t *>(&suid));
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_EQUAL(ruid, 200, ruid);
ICUNIT_ASSERT_EQUAL(ruid, 200, ruid); // 200: expected value of ruid
ICUNIT_ASSERT_EQUAL(euid, 200, euid);
ICUNIT_ASSERT_EQUAL(suid, 200, suid);
ret = setresuid(-1, -1, 300);
ret = setresuid(-1, -1, 300); // set saved-set user id to 300
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = getresuid((uid_t *)&ruid, (uid_t *)&euid, (uid_t *)&suid);
ret = getresuid(reinterpret_cast<uid_t *>(&ruid), reinterpret_cast<uid_t *>(&euid),
reinterpret_cast<uid_t *>(&suid));
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_EQUAL(ruid, 300, ruid);
ICUNIT_ASSERT_EQUAL(euid, 300, euid);
ICUNIT_ASSERT_EQUAL(euid, 300, euid); // 300: expected value of euid
ICUNIT_ASSERT_EQUAL(suid, 300, suid);
ret = setresuid(-1, 200, 300);
@@ -309,13 +314,14 @@ static int Child(void)
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ICUNIT_ASSERT_EQUAL(EINVAL, errno, errno);
ret = setresgid(100, 100, 100);
ret = setresgid(100, 100, 100); // 100: value of rgid, egid and sgid
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = getresgid((gid_t *)&rgid, (gid_t *)&egid, (gid_t *)&sgid);
ret = getresgid(reinterpret_cast<gid_t *>(&rgid), reinterpret_cast<gid_t *>(&egid),
reinterpret_cast<gid_t *>(&sgid));
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_EQUAL(rgid, 100, rgid);
ICUNIT_ASSERT_EQUAL(egid, 100, egid);
ICUNIT_ASSERT_EQUAL(sgid, 100, sgid);
ICUNIT_ASSERT_EQUAL(sgid, 100, sgid); // 100: expected value of sgid
ret = setresgid(200, 100, 100);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
@@ -329,29 +335,31 @@ static int Child(void)
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ICUNIT_ASSERT_EQUAL(EPERM, errno, errno);
ret = setresgid(-2, 100, 200);
ret = setresgid(-2, 100, 200); // set rgid to -2, egid to 100, sgid to 200
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ICUNIT_ASSERT_EQUAL(EINVAL, errno, errno);
ret = setresgid(100, -2, 200);
ret = setresgid(100, -2, 200); // set rgid to 100, egid to -2, sgid to 200
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ICUNIT_ASSERT_EQUAL(EINVAL, errno, errno);
ret = setresgid(100, 100, -2);
ret = setresgid(100, 100, -2); // set rgid and egid to 100, rgid to -2
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ICUNIT_ASSERT_EQUAL(EINVAL, errno, errno);
ret = setresgid(100, -1, -2);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ICUNIT_ASSERT_EQUAL(EINVAL, errno, errno);
ret = setresgid(-1, 200, 200);
ret = setresgid(-1, 200, 200); // 200: value of egid and sgid
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = getresgid((gid_t *)&rgid, (gid_t *)&egid, (gid_t *)&sgid);
ret = getresgid(reinterpret_cast<gid_t *>(&rgid), reinterpret_cast<gid_t *>(&egid),
reinterpret_cast<gid_t *>(&sgid));
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_EQUAL(rgid, 200, rgid);
ICUNIT_ASSERT_EQUAL(egid, 200, egid);
ICUNIT_ASSERT_EQUAL(sgid, 200, sgid);
ICUNIT_ASSERT_EQUAL(rgid, 200, rgid); // 200: expected value of rgid
ICUNIT_ASSERT_EQUAL(egid, 200, egid); // 200: expected value of egid
ICUNIT_ASSERT_EQUAL(sgid, 200, sgid); // 200: expected value of sgid
ret = setresgid(-1, -1, 300);
ret = setresgid(-1, -1, 300); // set sgid to 300
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = getresgid((gid_t *)&rgid, (gid_t *)&egid, (gid_t *)&sgid);
ret = getresgid(reinterpret_cast<gid_t *>(&rgid), reinterpret_cast<gid_t *>(&egid),
reinterpret_cast<gid_t *>(&sgid));
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_EQUAL(rgid, 300, rgid);
ICUNIT_ASSERT_EQUAL(egid, 300, egid);
@@ -361,8 +369,8 @@ static int Child(void)
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ICUNIT_ASSERT_EQUAL(EPERM, errno, errno);
size = getgroups(0, (gid_t *)getList);
size = getgroups(size, (gid_t *)getList);
size = getgroups(0, reinterpret_cast<gid_t *>(getList));
size = getgroups(size, reinterpret_cast<gid_t *>(getList));
pid_t pid = fork();
if (pid == 0) {
Child1(getList, size);
@@ -378,10 +386,10 @@ static int Child(void)
ret = setgroups(0, NULL);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = getgroups(0, (gid_t *)getList);
ret = getgroups(0, reinterpret_cast<gid_t *>(getList));
ICUNIT_ASSERT_EQUAL(ret, 1, ret);
ret = getgroups(1, (gid_t *)getList);
ret = getgroups(1, reinterpret_cast<gid_t *>(getList));
ICUNIT_ASSERT_EQUAL(ret, 1, ret);
ICUNIT_ASSERT_EQUAL(getList[0], getgid(), getList[0]);
@@ -411,7 +419,7 @@ static int TestCase(VOID)
int ret;
int status = 0;
pid_t pid = fork();
ICUNIT_GOTO_WITHIN_EQUAL(pid, 0, 100000, pid, EXIT);
ICUNIT_GOTO_WITHIN_EQUAL(pid, 0, 100000, pid, EXIT); // assume pid is between 0 and 100000
if (pid == 0) {
ret = Child();
exit(__LINE__);

2
testsuites/unittest/security/vid/smoke/vid_test_001.cpp
View File

@@ -122,7 +122,7 @@ static void ChildFunc()
ret1 = (INT32 *)timer_delete(tid);
ICUNIT_ASSERT_EQUAL_VOID(ret1, 0, ret1);
exit((int)(intptr_t)tid);
exit(static_cast<int>(reinterpret_cast<intptr_t>(tid)));
}
static UINT32 TestCase(VOID)