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

!764 Codex告警清除 

Merge pull request !764 from xuxinyu/master
This commit is contained in:
openharmony_ci 2022-01-10 04:56:46 +00:00 committed by Gitee
parent 9995d8e0e4 1cdd7307f3
commit d6dc0642c5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/shell/src/shmsg.c
View File

@ -364,11 +364,13 @@ void ChildExec(const char *cmdName, char *const paramArray[])
gid = getpgrp(); gid = getpgrp();
if (gid < 0) { if (gid < 0) {
printf("get group id failed, pgrpid %d, errno %d\n", gid, errno); printf("get group id failed, pgrpid %d, errno %d\n", gid, errno);
exit(1);
} }
ret = tcsetpgrp(STDIN_FILENO, gid); ret = tcsetpgrp(STDIN_FILENO, gid);
if (ret != 0) { if (ret != 0) {
printf("tcsetpgrp failed, errno %d\n", errno); printf("tcsetpgrp failed, errno %d\n", errno);
exit(1);
} }
ret = execve(cmdName, paramArray, NULL); ret = execve(cmdName, paramArray, NULL);

6
compat/posix/src/misc.c
View File

@ -40,7 +40,6 @@
#include "los_process_pri.h" #include "los_process_pri.h"
#include "los_hw.h" #include "los_hw.h"
static struct rlimit g_defaultLimit = { 0 };
/* /*
* Supply some suitable values for constants that may not be present * Supply some suitable values for constants that may not be present
* in all configurations. * in all configurations.
@ -168,7 +167,10 @@ int getrlimit(int resource, struct rlimit *rlim)
} }
if (resourceLimit == NULL) { if (resourceLimit == NULL) {
resourceLimit = &g_defaultLimit; rlim->rlim_cur = 0;
rlim->rlim_max = 0;
return 0;
} }
SCHEDULER_LOCK(intSave); SCHEDULER_LOCK(intSave);

2
kernel/extended/hidumper/los_hidumper.c
View File

@ -319,7 +319,7 @@ static INT32 HiDumperIoctl(struct file *filep, INT32 cmd, unsigned long arg)
break; break;
case HIDUMPER_MEM_DATA: case HIDUMPER_MEM_DATA:
if (g_adapter.DumpMemData != NULL) { if (g_adapter.DumpMemData != NULL) {
g_adapter.DumpMemData((struct MemDumpParam *)arg); g_adapter.DumpMemData((struct MemDumpParam *)((UINTPTR)arg));
} }
break; break;
default: default:

2
syscall/fs_syscall.c
View File

@ -2570,7 +2570,7 @@ int SysPselect6(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
((struct timeval *)timeout)->tv_usec = timeout->tv_nsec / 1000; /* 1000, convert ns to us */ ((struct timeval *)timeout)->tv_usec = timeout->tv_nsec / 1000; /* 1000, convert ns to us */
if (data != NULL) { if (data != NULL) {
retVal = LOS_ArchCopyFromUser(&(setl.sig[0]), (int *)data[0], sizeof(sigset_t)); retVal = LOS_ArchCopyFromUser(&(setl.sig[0]), (int *)((UINTPTR)data[0]), sizeof(sigset_t));
if (retVal != 0) { if (retVal != 0) {
ret = -EFAULT; ret = -EFAULT;
FREE_DUP(timeout); FREE_DUP(timeout);