openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2025-02-18 19:09:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

处理init告警

Browse Source 
Signed-off-by: chennuo <chennuo12@huawei.com>
This commit is contained in:
chennuo 2024-10-15 12:04:02 +08:00
parent 7defffb1cf
commit 645ff3dce0
7 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
remount/remount_overlay.c
View File

@ -40,7 +40,7 @@ INIT_STATIC bool MntNeedRemount(const char *mnt)
char *remountPath[] = {
"/", "/vendor", "/sys_prod", "/chip_prod", "/preload", "/cust", "/version", "/patch_hw"
};
for (int i = 0; i < ARRAY_LENGTH(remountPath); i++) {
for (size_t i = 0; i < ARRAY_LENGTH(remountPath); i++) {
if (strcmp(remountPath[i], mnt) == 0) {
return true;
}

2
services/init/standard/init_control_fd_service.c
View File

@ -126,7 +126,7 @@ static void DumpOneService(const Service *service)
printf("\tservice name: [%s] \n", service->name);
printf("\tservice pid: [%d] \n", service->pid);
int tmpCount = sizeof(initErrMaps) / sizeof(initErrMaps[0]);
if (service->lastErrno < tmpCount) {
if ((int)service->lastErrno < tmpCount) {
printf("\tservice last error: %s(%d) \n", initErrMaps[service->lastErrno].info, service->lastErrno);
} else {
printf("\tservice last error: %d \n", service->lastErrno);

2
services/modules/init_context/init_context.c
View File

@ -145,7 +145,7 @@ static int SubInitExecuteCmd(InitContextType type, const char *name, const char
while ((rLen < 0) && (errno == EAGAIN)) {
rLen = TEMP_FAILURE_RETRY(read(subInfo->recvFd, buffer, sizeof(buffer)));
}
PLUGIN_CHECK(rLen >= 0 && rLen < sizeof(buffer), return errno,
PLUGIN_CHECK(rLen >= 0 && (size_t)rLen < sizeof(buffer), return errno,
"Failed to read result from %d for cmd %s errno %d", subInfo->type, name, errno);
// change to result
buffer[rLen] = '\0';

2
services/param/linux/param_request.c
View File

@ -114,7 +114,7 @@ static int ReadMessage(int fd, char *buffer, uint32_t timeout)
}
}
if (recvLen > sizeof(ParamMessage)) {
if ((size_t)recvLen > sizeof(ParamMessage)) {
PARAM_LOGV("recv message len is %d", recvLen);
break;
}

1
services/param/linux/param_service.c
View File

@ -324,7 +324,6 @@ static int HandleParamSave(const ParamTaskPtr worker, const ParamMessage *msg)
#endif
}
PARAM_LOGI("process info:pid = %d, uid = %d, gid = %d", cr.pid, cr.uid, cr.gid);
PARAM_CHECK(cr.uid != -1, return -1, "Invalid uid");
int ret = CheckIfUidInGroup(cr.uid, "servicectrl");
PARAM_CHECK(ret == 0, return SendResponseMsg(worker, msg, -1), "Failed to process save parameters : ret %d", ret);
CheckAndSavePersistParam();

3
services/utils/init_utils.c
View File

@ -785,7 +785,8 @@ void *OH_ExtendableStrDictGet(void **strDict, int dictSize, const char *target,
const char *pos;
str_compare cmp = strcmp;
if ((strDict == NULL) || (dictSize < sizeof(const char *)) || (target == NULL) || (target[0] == '\0')) {
if ((strDict == NULL) || dictSize < 0 || ((size_t)dictSize < sizeof(const char *)) ||
(target == NULL) || (target[0] == '\0')) {
return NULL;
}

8
ueventd/ueventd_main.c
View File

@ -167,7 +167,7 @@ static void usage(const char *name)
static void UeventdLogPrint(int logLevel, uint32_t domain, const char *tag, const char *fmt, va_list vargs)
{
if (logLevel < GetInitLogLevel()) {
if (logLevel < (int)GetInitLogLevel()) {
return;
}
vprintf(fmt, vargs);
@ -177,7 +177,6 @@ static void UeventdLogPrint(int logLevel, uint32_t domain, const char *tag, cons
int main(int argc, char *argv[])
{
int opt;
const char *config;
int daemon = UEVENTD_MODE_DEAMON;
while ((opt = getopt(argc, argv, "drblv:h")) != -1) {
@ -213,11 +212,6 @@ int main(int argc, char *argv[])
}
}
config = NULL;
if (optind >= argc) {
config = argv[optind];
}
if (daemon == UEVENTD_MODE_DEAMON) {
return UeventdDaemon(0);
} else if (daemon == UEVENTD_MODE_RETRIGGER) {