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

9
testsuites/unittest/process/basic/process/full/process_test_042.cpp
View File

@@ -38,7 +38,7 @@ static void Child2(int shmid)
{
int count = 2; // 2, Set the calculation number to determine the cycle status.
int *shared = (int *)shmat(shmid, nullptr, 0);
ICUNIT_ASSERT_NOT_EQUAL_VOID(shared, (void *)-1, shared);
ICUNIT_ASSERT_NOT_EQUAL_VOID(shared, reinterpret_cast<void *>(-1), shared);
while ((*shared) < (TEST_LOOP + 2)) { // 2, Set the cycle number.
ICUNIT_ASSERT_EQUAL_VOID(*shared, count, *shared);
@@ -55,7 +55,7 @@ static void Child1(int shmid)
{
int count = 1;
int *shared = (int *)shmat(shmid, nullptr, 0);
ICUNIT_ASSERT_NOT_EQUAL_VOID(shared, (void *)-1, shared);
ICUNIT_ASSERT_NOT_EQUAL_VOID(shared, reinterpret_cast<void *>(-1), shared);
while ((*shared) < (TEST_LOOP + 1)) {
ICUNIT_ASSERT_EQUAL_VOID(*shared, count, *shared);
@@ -92,7 +92,8 @@ static int GroupProcess(void)
ret = pthread_setschedparam(pthread_self(), SCHED_FIFO, &param);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
shmid = shmget((key_t)1234, memSize, 0666 | IPC_CREAT); // 1234, Sets the shmget key; 0666 config of shmget
/* 1234, Sets the shmget key; 0666 config of shmget */
shmid = shmget(static_cast<key_t>(1234), memSize, 0666 | IPC_CREAT);
ICUNIT_ASSERT_NOT_EQUAL(shmid, -1, shmid);
pid = fork();
@@ -112,7 +113,7 @@ static int GroupProcess(void)
}
shared = (int *)shmat(shmid, nullptr, 0);
ICUNIT_ASSERT_NOT_EQUAL(shared, (void *)-1, shared);
ICUNIT_ASSERT_NOT_EQUAL(shared, reinterpret_cast<void *>(-1), shared);
(*shared) = 0;

6
testsuites/unittest/process/basic/process/full/process_test_049.cpp
View File

@@ -88,14 +88,14 @@ static int Testcase(void)
ICUNIT_ASSERT_NOT_EQUAL(shmid, -1, shmid);
g_shmptr = (int *)shmat(shmid, nullptr, 0);
ICUNIT_ASSERT_NOT_EQUAL(g_shmptr, (int *)-1, g_shmptr);
ICUNIT_ASSERT_NOT_EQUAL(g_shmptr, reinterpret_cast<int *>(-1), g_shmptr);
*g_shmptr = 0;
stack = (char *)malloc(arg);
stack = static_cast<char *>(malloc(arg));
ICUNIT_GOTO_NOT_EQUAL(stack, NULL, stack, EXIT1);
stackTop = (char *)((unsigned long)stack + arg);
stackTop = reinterpret_cast<char *>(reinterpret_cast<unsigned long>(stack) + arg);
pid = clone(TestThread, (void *)stackTop, CLONE_VFORK, &arg);
ICUNIT_GOTO_EQUAL(*g_shmptr, arg, *g_shmptr, EXIT2);

4
testsuites/unittest/process/basic/process/full/process_test_050.cpp
View File

@@ -60,7 +60,7 @@ static int Testcase(void)
ICUNIT_ASSERT_NOT_EQUAL(shmid, -1, shmid);
g_shmptr = (int *)shmat(shmid, nullptr, 0);
ICUNIT_ASSERT_NOT_EQUAL(g_shmptr, (int *)-1, g_shmptr);
ICUNIT_ASSERT_NOT_EQUAL(g_shmptr, reinterpret_cast<int *>(-1), g_shmptr);
*g_shmptr = 0;
@@ -70,7 +70,7 @@ static int Testcase(void)
stack = malloc(arg);
ICUNIT_GOTO_NOT_EQUAL(stack, NULL, stack, EXIT1);
stackTop = (char *)((unsigned long)stack + arg);
stackTop = reinterpret_cast<char *>(reinterpret_cast<unsigned long>(stack) + arg);
pid = clone(TestThread, (void *)stackTop, CLONE_PARENT, &arg);
ret = waitpid(pid, &status, NULL);

4
testsuites/unittest/process/basic/process/full/process_test_051.cpp
View File

@@ -75,7 +75,7 @@ static int Testcase(void)
ICUNIT_ASSERT_NOT_EQUAL(shmid, -1, shmid);
g_shmptr = (int *)shmat(shmid, nullptr, 0);
ICUNIT_ASSERT_NOT_EQUAL(g_shmptr, (int *)-1, g_shmptr);
ICUNIT_ASSERT_NOT_EQUAL(g_shmptr, reinterpret_cast<int *>(-1), g_shmptr);
*g_shmptr = 0;
@@ -85,7 +85,7 @@ static int Testcase(void)
stack = malloc(arg);
ICUNIT_GOTO_NOT_EQUAL(stack, NULL, stack, EXIT1);
stackTop = (char *)((unsigned long)stack + arg);
stackTop = reinterpret_cast<char *>(reinterpret_cast<unsigned long>(stack) + arg);
pid = clone(TestThread, (void *)stackTop, CLONE_PARENT | CLONE_VFORK, &arg);
ICUNIT_GOTO_EQUAL(*g_shmptr, 100, *g_shmptr, EXIT2); // 100, assert g_shmptr equal to this.

6
testsuites/unittest/process/basic/process/full/process_test_052.cpp
View File

@@ -58,17 +58,17 @@ static int Testcase(void)
ICUNIT_ASSERT_NOT_EQUAL(shmid, -1, shmid);
g_shmptr = (int *)shmat(shmid, nullptr, 0);
ICUNIT_ASSERT_NOT_EQUAL(g_shmptr, (int *)-1, g_shmptr);
ICUNIT_ASSERT_NOT_EQUAL(g_shmptr, static_cast<int *>(-1), g_shmptr);
*g_shmptr = 0;
g_ppid = getppid();
printf("testcase ppid : %d\n", g_ppid);
void *stack = (void *)malloc(arg);
void *stack = malloc(arg);
ICUNIT_GOTO_NOT_EQUAL(stack, NULL, stack, EXIT1);
char *stackTop = (char *)((unsigned long)stack + arg);
char *stackTop = static_cast<char *>(static_cast<unsigned long>(stack) + arg);
pid_t pid = clone(TestThread, (char *)stackTop, CLONE_PARENT | CLONE_VFORK | CLONE_FILES, &arg);
ICUNIT_GOTO_EQUAL(*g_shmptr, 100, *g_shmptr, EXIT2); // 100, assert g_shmptr equal to this.

4
testsuites/unittest/process/basic/process/full/process_test_062.cpp
View File

@@ -95,12 +95,12 @@ static int TestCase(void)
status = WEXITSTATUS(status);
ICUNIT_GOTO_EQUAL(status, 10, status, EXIT); // 10, assert that function Result is equal to this.
shmdt((void *)g_shmptr);
shmdt(static_cast<void *>(const_cast<int *>(g_shmptr)));
shmctl(shmid, IPC_RMID, NULL);
return 0;
EXIT:
shmdt((void *)g_shmptr);
shmdt(static_cast<void *>(const_cast<int *>(g_shmptr)));
shmctl(shmid, IPC_RMID, NULL);
return 1;
}

18
testsuites/unittest/process/basic/process/full/process_test_063.cpp
View File

@@ -52,12 +52,12 @@ static void GetRandomData(char **buf, int bufSize)
char *p = *buf;
int i;
srand((unsigned)time(0));
srand(static_cast<unsigned>(time(0)));
for (i = 0; i < bufSize - 1; ++i) {
int r = GetRandomNumber(RANDOM_MAX);
*(p + i) = (char)r;
*(p + i) = static_cast<char>(r);
}
*(p + i) = (char)0;
*(p + i) = static_cast<char>(0);
}
static int TestCase(VOID)
@@ -73,36 +73,36 @@ static int TestCase(VOID)
ret = posix_spawn(&pid, NULL, NULL, NULL, NULL, NULL);
ICUNIT_ASSERT_EQUAL(ret, EINVAL, ret);
childFileName = (char *)1;
childFileName = reinterpret_cast<char *>(1);
ret = posix_spawn(&pid, childFileName, NULL, NULL, NULL, NULL);
ICUNIT_ASSERT_EQUAL(ret, EINVAL, ret);
childArgv = (char **)1;
childArgv = reinterpret_cast<char **>(1);
ret = posix_spawn(&pid, "/usr/bin/testsuits_app", NULL, NULL, childArgv, NULL);
ICUNIT_ASSERT_EQUAL(ret, EINVAL, ret);
childEnvp = (char **)1;
childEnvp = reinterpret_cast<char **>(1);
ret = posix_spawn(&pid, "/usr/bin/testsuits_app", NULL, NULL, NULL, childEnvp);
ICUNIT_ASSERT_EQUAL(ret, EINVAL, ret);
ret = posix_spawn(&pid, "/bin", NULL, NULL, NULL, NULL);
ICUNIT_ASSERT_EQUAL(ret, ENOENT, ret);
fileName = (char *)malloc(FILE_NAME_BYTES);
fileName = static_cast<char *>(malloc(FILE_NAME_BYTES));
ICUNIT_ASSERT_NOT_EQUAL(fileName, NULL, fileName);
GetRandomData(&fileName, FILE_NAME_BYTES);
ret = posix_spawn(&pid, fileName, NULL, NULL, NULL, NULL);
free(fileName);
ICUNIT_ASSERT_EQUAL(ret, ENOENT, ret);
fileName = (char *)malloc(LONG_FILE_NAME_BYTES);
fileName = static_cast<char *>(malloc(LONG_FILE_NAME_BYTES));
ICUNIT_ASSERT_NOT_EQUAL(fileName, NULL, fileName);
GetRandomData(&fileName, LONG_FILE_NAME_BYTES);
ret = posix_spawn(&pid, fileName, NULL, NULL, NULL, NULL);
free(fileName);
ICUNIT_ASSERT_EQUAL(ret, ENAMETOOLONG, ret);
ret = posix_spawn(&pid, (char *)INVALID_USER_VADDR, NULL, NULL, NULL, NULL);
ret = posix_spawn(&pid, reinterpret_cast<char *>(INVALID_USER_VADDR), nullptr, nullptr, nullptr, nullptr);
ICUNIT_ASSERT_EQUAL(ret, EFAULT, ret);
return 0;

14
testsuites/unittest/process/basic/process/full/process_test_064.cpp
View File

@@ -52,12 +52,12 @@ static void GetRandomData(char **buf, int bufSize)
char *p = *buf;
int i;
srand((unsigned)time(0));
srand(static_cast<unsigned>(time(0)));
for (i = 0; i < bufSize - 1; ++i) {
int r = GetRandomNumber(RANDOM_MAX);
*(p + i) = (char)r;
*(p + i) = static_cast<char>(r);
}
*(p + i) = (char)0;
*(p + i) = static_cast<char>(0);
}
static int TestCase(VOID)
@@ -70,25 +70,25 @@ static int TestCase(VOID)
char **childArgv = NULL;
char **childEnvp = NULL;
childArgv = (char **)1;
childArgv = reinterpret_cast<char **>(1);
ret = posix_spawnp(&pid, "/usr/bin/testsuits_app", NULL, NULL, childArgv, NULL);
ICUNIT_ASSERT_EQUAL(ret, EINVAL, ret);
childEnvp = (char **)1;
childEnvp = reinterpret_cast<char **>(1);
ret = posix_spawnp(&pid, "/usr/bin/testsuits_app", NULL, NULL, NULL, childEnvp);
ICUNIT_ASSERT_EQUAL(ret, EINVAL, ret);
ret = posix_spawnp(&pid, "/bin", NULL, NULL, NULL, NULL);
ICUNIT_ASSERT_EQUAL(ret, ENOENT, ret);
fileName = (char *)malloc(FILE_NAME_BYTES);
fileName = static_cast<char *>(malloc(FILE_NAME_BYTES));
ICUNIT_ASSERT_NOT_EQUAL(fileName, NULL, fileName);
GetRandomData(&fileName, FILE_NAME_BYTES);
ret = posix_spawnp(&pid, fileName, NULL, NULL, NULL, NULL);
free(fileName);
ICUNIT_ASSERT_EQUAL(ret, ENOENT, ret);
fileName = (char *)malloc(LONG_FILE_NAME_BYTES);
fileName = static_cast<char *>(malloc(LONG_FILE_NAME_BYTES));
ICUNIT_ASSERT_NOT_EQUAL(fileName, NULL, fileName);
GetRandomData(&fileName, LONG_FILE_NAME_BYTES);
ret = posix_spawnp(&pid, fileName, NULL, NULL, NULL, NULL);

10
testsuites/unittest/process/basic/process/it_test_process.h
View File

@@ -40,11 +40,11 @@
static inline int Syscall(int nbr, int parm1, int parm2, int parm3, int parm4)
{
register int reg7 __asm__("r7") = (int)(nbr);
register int reg3 __asm__("r3") = (int)(parm4);
register int reg2 __asm__("r2") = (int)(parm3);
register int reg1 __asm__("r1") = (int)(parm2);
register int reg0 __asm__("r0") = (int)(parm1);
register int reg7 __asm__("r7") = nbr;
register int reg3 __asm__("r3") = parm4;
register int reg2 __asm__("r2") = parm3;
register int reg1 __asm__("r1") = parm2;
register int reg0 __asm__("r0") = parm1;
__asm__ __volatile__("svc 0" : "=r"(reg0) : "r"(reg7), "r"(reg0), "r"(reg1), "r"(reg2), "r"(reg3) : "memory");

4
testsuites/unittest/process/basic/process/smoke/process_test_023.cpp
View File

@@ -46,7 +46,7 @@ static void *ThreadFunc(void *arg)
ICUNIT_ASSERT_NOT_EQUAL_NULL(g_thread002, 0, g_thread002);
g_thread001++;
return (void *)9; // 9, set thread return value.
return reinterpret_cast<void *>(9); // 9, set thread return value.
EXIT:
return NULL;
}
@@ -61,7 +61,7 @@ static void *ThreadFunc2(void *arg)
ICUNIT_ASSERT_NOT_EQUAL_NULL(ret, -1, ret);
ICUNIT_ASSERT_NOT_EQUAL_NULL(g_thread001, 0, g_thread001);
return (void *)9; // 9, set thread return value.
return reinterpret_cast<void *>(9); // 9, set thread return value.
EXIT:
return NULL;
}

6
testsuites/unittest/process/basic/pthread/full/pthread_test_001.cpp
View File

@@ -71,7 +71,7 @@ static void *ThreadFunc4(void *arg)
ret = pthread_cancel(pthread);
}
}
return (void *)i;
return reinterpret_cast<void *>(i);
EXIT:
return NULL;
@@ -100,7 +100,7 @@ static void *ThreadFunc3(void *arg)
}
ICUNIT_GOTO_EQUAL(i, 10, i, EXIT); // 10, here assert the result.
return (void *)i;
return reinterpret_cast<void *>(i);
EXIT:
return NULL;
}
@@ -132,7 +132,7 @@ static void *ThreadFunc6(void *arg)
ICUNIT_GOTO_EQUAL(g_pthreadTestCount, 12, g_pthreadTestCount, EXIT); // 12, here assert the result.
g_pthreadTestCount++; // 13
return (void *)pthread_self();
return reinterpret_cast<void *>(pthread_self());
EXIT:
return NULL;

4
testsuites/unittest/process/basic/pthread/full/pthread_test_004.cpp
View File

@@ -163,7 +163,7 @@ static void *ThreadFunc4(void *arg)
ret = pthread_cancel(pthread);
}
}
return (void *)i;
return reinterpret_cast<void *>(i);
EXIT:
return NULL;
@@ -196,7 +196,7 @@ static void *ThreadFunc3(void *arg)
}
ICUNIT_GOTO_EQUAL(i, 10, i, EXIT); // 10, here assert the result.
return (void *)i;
return reinterpret_cast<void *>(i);
EXIT:
return NULL;

10
testsuites/unittest/process/basic/pthread/it_pthread_test.h
View File

@@ -42,11 +42,11 @@
static inline int Syscall(int nbr, int parm1, int parm2, int parm3, int parm4)
{
register int reg7 __asm__("r7") = (int)(nbr);
register int reg3 __asm__("r3") = (int)(parm4);
register int reg2 __asm__("r2") = (int)(parm3);
register int reg1 __asm__("r1") = (int)(parm2);
register int reg0 __asm__("r0") = (int)(parm1);
register int reg7 __asm__("r7") = nbr;
register int reg3 __asm__("r3") = parm4;
register int reg2 __asm__("r2") = parm3;
register int reg1 __asm__("r1") = parm2;
register int reg0 __asm__("r0") = parm1;
__asm__ __volatile__("svc 0" : "=r"(reg0) : "r"(reg7), "r"(reg0), "r"(reg1), "r"(reg2), "r"(reg3) : "memory");

2
testsuites/unittest/process/basic/pthread/smoke/pthread_once_test_001.cpp
View File

@@ -44,7 +44,7 @@ static void *Threadfunc(void *parm)
int err;
err = pthread_once(&g_onceCtrl, InitRoutine);
ICUNIT_GOTO_EQUAL(err, 0, err, EXIT);
return (void *)g_okStatus;
return reinterpret_cast<void *>(g_okStatus);
EXIT:
return NULL;
}

2
testsuites/unittest/process/basic/pthread/smoke/pthread_test_019.cpp
View File

@@ -77,7 +77,7 @@ static int GroupProcess(void)
stackSize = 3000; // 3000, change stackSize, test again.
pthread_attr_init(&attr);
stack = (void *)0x1000;
stack = reinterpret_cast<void *>(0x1000);
ret = pthread_attr_setstack(&attr, stack, stackSize);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);

2
testsuites/unittest/process/lock/rwlock/full/pthread_rwlock_test_002.cpp
View File

@@ -227,7 +227,7 @@ static int PthreadRwlockTest(void)
int index = 0;
int curThreadPri, curThreadPolicy;
ret = memset_s((void *)g_rwlockData, sizeof(int) * TEST_DATA_SIZE, 0, sizeof(int) * TEST_DATA_SIZE);
ret = memset_s(static_cast<void *>(g_rwlockData), sizeof(int) * TEST_DATA_SIZE, 0, sizeof(int) * TEST_DATA_SIZE);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
g_rwlockMask = 0;

2
testsuites/unittest/process/lock/rwlock/smoke/pthread_rwlock_test_001.cpp
View File

@@ -227,7 +227,7 @@ static int Testcase(void)
int index = 0;
int curThreadPri, curThreadPolicy;
ret = memset_s((void *)g_rwlockData, sizeof(int) * TEST_DATA_SIZE, 0, sizeof(int) * TEST_DATA_SIZE);
ret = memset_s(static_cast<void *>(g_rwlockData), sizeof(int) * TEST_DATA_SIZE, 0, sizeof(int) * TEST_DATA_SIZE);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
g_rwlockMask = 0;

2
testsuites/unittest/process/lock/spinlock/smoke/pthread_spinlock_test_001.cpp
View File

@@ -134,7 +134,7 @@ static int Testcase(void)
int index = 0;
int curThreadPri, curThreadPolicy;
ret = memset_s((void *)g_spinlockData, sizeof(int) * TEST_DATA_SIZE, 0, sizeof(int) * TEST_DATA_SIZE);
ret = memset_s(static_cast<void *>(g_spinlockData), sizeof(int) * TEST_DATA_SIZE, 0, sizeof(int) * TEST_DATA_SIZE);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
g_spinlockMask = 0;