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

!1071 fix：增强对LOS_ArchCopyToUser接口的安全防护 

Merge pull request !1071 from zhangdengyu/fix_kernelStack_1115
This commit is contained in:
openharmony_ci 2022-11-28 09:07:57 +00:00 committed by Gitee
parent b5ce4d34df 07e3feb456
commit ead4da80ba
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/base/vm/shm.c
View File

@ -604,7 +604,7 @@ INT32 ShmCtl(INT32 shmid, INT32 cmd, struct shmid_ds *buf)
{ {
struct shmIDSource *seg = NULL; struct shmIDSource *seg = NULL;
INT32 ret = 0; INT32 ret = 0;
struct shm_info shmInfo; struct shm_info shmInfo = { 0 };
struct ipc_perm shm_perm; struct ipc_perm shm_perm;
cmd = ((UINT32)cmd & ~IPC_64); cmd = ((UINT32)cmd & ~IPC_64);

2
syscall/fs_syscall.c
View File

@ -1520,7 +1520,7 @@ ssize_t SysPread64(int fd, void *buf, size_t nbytes, off64_t offset)
if (bufRet == NULL) { if (bufRet == NULL) {
return -ENOMEM; return -ENOMEM;
} }
(void)memset_s(bufRet, nbytes, 0, nbytes);
ret = pread64(fd, (buf ? bufRet : NULL), nbytes, offset); ret = pread64(fd, (buf ? bufRet : NULL), nbytes, offset);
if (ret < 0) { if (ret < 0) {
(void)LOS_MemFree(OS_SYS_MEM_ADDR, bufRet); (void)LOS_MemFree(OS_SYS_MEM_ADDR, bufRet);

5
syscall/ipc_syscall.c
View File

@ -106,7 +106,8 @@ int SysMqNotify(mqd_t personal, const struct sigevent *sigev)
int SysMqGetSetAttr(mqd_t mqd, const struct mq_attr *new, struct mq_attr *old) int SysMqGetSetAttr(mqd_t mqd, const struct mq_attr *new, struct mq_attr *old)
{ {
int ret; int ret;
struct mq_attr knew, kold; struct mq_attr knew;
struct mq_attr kold = { 0 };
if (new != NULL) { if (new != NULL) {
ret = LOS_ArchCopyFromUser(&knew, new, sizeof(struct mq_attr)); ret = LOS_ArchCopyFromUser(&knew, new, sizeof(struct mq_attr));
@ -256,7 +257,7 @@ int SysSigTimedWait(const sigset_t_l *setl, siginfo_t *info, const struct timesp
sigset_t set; sigset_t set;
unsigned int tick; unsigned int tick;
int retVal, ret; int retVal, ret;
siginfo_t infoIntr; siginfo_t infoIntr = { 0 };
struct timespec timeoutIntr; struct timespec timeoutIntr;
retVal = LOS_ArchCopyFromUser(&set, &(setl->sig[0]), sizeof(sigset_t)); retVal = LOS_ArchCopyFromUser(&set, &(setl->sig[0]), sizeof(sigset_t));

2
syscall/misc_syscall.c
View File

@ -208,7 +208,7 @@ long SysSysconf(int name)
int SysUgetrlimit(int resource, unsigned long long k_rlim[2]) int SysUgetrlimit(int resource, unsigned long long k_rlim[2])
{ {
int ret; int ret;
struct rlimit lim; struct rlimit lim = { 0 };
ret = getrlimit(resource, &lim); ret = getrlimit(resource, &lim);
if (ret < 0) { if (ret < 0) {

2
syscall/process_syscall.c
View File

@ -255,7 +255,7 @@ int SysSchedRRGetInterval(int pid, struct timespec *tp)
int ret; int ret;
SchedParam param = { 0 }; SchedParam param = { 0 };
time_t timeSlice = 0; time_t timeSlice = 0;
struct timespec tv; struct timespec tv = { 0 };
LosTaskCB *taskCB = NULL; LosTaskCB *taskCB = NULL;
LosProcessCB *processCB = NULL; LosProcessCB *processCB = NULL;