!1218 SysEpollWait 系统调用使用正确长度。

Merge pull request !1218 from hw_llm/master
Description: syscall SysEpollWait 执行漏洞修复
2024-08-23 09:27:21 +00:00 · 2024-08-23 16:28:32 +08:00 · 2024-08-22 07:06:10 +00:00 · 2024-08-21 20:57:40 +08:00 · 2024-08-20 13:58:56 +00:00 · 2024-08-19 11:04:32 +08:00
6 changed files with 10 additions and 5 deletions
--- a/fs/jffs2/jffs2.patch
+++ b/fs/jffs2/jffs2.patch
@@ -6340,7 +6340,7 @@ diff -Nupr old/fs/jffs2/summary.h new/fs/jffs2/summary.h
 diff -Nupr old/fs/jffs2/super.c new/fs/jffs2/super.c
 --- old/fs/jffs2/super.c	2022-05-09 17:22:53.000000000 +0800
 +++ new/fs/jffs2/super.c	2022-05-09 20:09:32.170000000 +0800
-@@ -9,433 +9,188 @@
+@@ -9,434 +9,188 @@
  *
  */
 
@@ -6418,6 +6418,7 @@ diff -Nupr old/fs/jffs2/super.c new/fs/jffs2/super.c
 +	c->cleanmarker_size = sizeof(struct jffs2_unknown_node);
 
 -	mutex_init(&f->sem);
+-	f->target = NULL;
 -	inode_init_once(&f->vfs_inode);
 -}
 +	ret = jffs2_do_mount_fs(c);
--- a/fs/vfs/epoll/fs_epoll.c
+++ b/fs/vfs/epoll/fs_epoll.c
@@ -326,7 +326,7 @@ int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents, int timeout
        return -1;
    }

-    for (i = 0; i < epHead->nodeCount; i++) {
+    for (i = 0; i < pollSize; i++) {
        pFd[i].fd = epHead->evs[i].data.fd;
        pFd[i].events = (short)epHead->evs[i].events;
    }
--- a/kernel/common/console.c
+++ b/kernel/common/console.c
@@ -687,7 +687,7 @@ STATIC ssize_t ConsoleRead(struct file *filep, CHAR *buffer, size_t bufLen)
    }

    if (userBuf) {
-        if (LOS_ArchCopyToUser(buffer, sbuffer, bufLen) != 0) {
+        if (LOS_ArchCopyToUser(buffer, sbuffer, ret) != 0) {
            ret = -EFAULT;
            goto ERROUT;
        }
--- a/kernel/extended/plimit/los_devicelimit.c
+++ b/kernel/extended/plimit/los_devicelimit.c
@@ -488,7 +488,7 @@ UINT32 OsDevLimitWriteDeny(ProcLimitSet *plimit, const CHAR *buf, UINT32 size)
 STATIC VOID DevLimitItemSetAccess(CHAR *accArray, INT16 access)
 {
    INT32 index = 0;
-    (VOID)memset_s(acc, ACCLEN, 0, ACCLEN);
+    (VOID)memset_s(accArray, ACCLEN, 0, ACCLEN);
    if (access & DEVLIMIT_ACC_READ) {
        accArray[index] = 'r';
        index++;
--- a/shell/full/src/base/shell_lk.c
+++ b/shell/full/src/base/shell_lk.c
@@ -154,7 +154,6 @@ INT32 CmdLog(INT32 argc, const CHAR **argv)
            PRINTK("not support yet\n");
        }
    } else if (!strncmp(argv[0], "path", strlen(argv[0]) + 1)) {
-        OsLkLogFileSet(argv[1]);
        PRINTK("not support yet\n");
    } else {
        PRINTK("Usage: log level <num>\n");
--- a/tools/build/mk/los_config.mk
+++ b/tools/build/mk/los_config.mk
@@ -124,6 +124,11 @@ LITEOS_BASELIB += -lcommon
 LIB_SUBDIRS       += kernel/common
 LITEOS_KERNEL_INCLUDE   += -I $(LITEOSTOPDIR)/kernel/common

+ifeq ($(LOSCFG_KERNEL_CONTAINER), y)
+    LITEOS_BASELIB    += -lcontainer
+    LIB_SUBDIRS       += kernel/extended/container
+endif
+
 ifeq ($(LOSCFG_KERNEL_CPPSUPPORT), y)
    LITEOS_BASELIB += -lcppsupport
    LIB_SUBDIRS       += kernel/extended/cppsupport
Author	SHA1	Message	Date
openharmony_ci	cab654a3fe	!1218 SysEpollWait 系统调用使用正确长度。 Merge pull request !1218 from hw_llm/master	2024-08-23 09:27:21 +00:00
hw_llm	5e3a8f11b4	Description: syscall SysEpollWait 执行漏洞修复 IssueNo: https://gitee.com/openharmony/kernel_liteos_a/issues/IALYB5?from=project-issue Feature Or Bugfix: Bugfix Binary Source: No Signed-off-by: hw_llm <liu.limin@huawei.com>	2024-08-23 16:28:32 +08:00
openharmony_ci	2e642e6d9a	!1212 console read 漏洞修复 Merge pull request !1212 from hw_llm/master	2024-08-22 07:06:10 +00:00
hw_llm	b22a7c266e	Description: console read 漏洞修复 IssueNo: https://gitee.com/openharmony/kernel_liteos_a/issues/IALLNX?from=project-issue Feature Or Bugfix: Feature Binary Source: No Signed-off-by: hw_llm <liu.limin@huawei.com>	2024-08-21 20:57:40 +08:00
openharmony_ci	ef1b6f9cde	!1209 liteos_a 内核shell 漏洞修复 Merge pull request !1209 from hw_llm/master	2024-08-20 13:58:56 +00:00
hw_llm	2ac53f2c00	Description: shell lk 漏洞修复 IssueNo: https://gitee.com/openharmony/kernel_liteos_a/issues/IAKVF0 Feature Or Bugfix: Feature Binary Source: No Signed-off-by: hw_llm <liu.limin@huawei.com>	2024-08-19 11:04:32 +08:00
openharmony_ci	37162aafb6	!1202 容器测试编译报错问题 Merge pull request !1202 from hw_llm/master	2024-08-15 13:30:11 +00:00
hw_llm	d958a8537c	Description: 解决容器编译报错问题 IssueNo: https://gitee.com/openharmony/kernel_liteos_a/issues/I9TEYD Feature Or Bugfix: Bugfix Binary Source: No Signed-off-by: hw_llm <liu.limin@huawei.com>	2024-08-15 19:10:19 +08:00
openharmony_ci	aaf352f7f2	!1201 内核代码适配 Merge pull request !1201 from yaowenrui/master	2024-08-15 02:45:09 +00:00
yaowenrui	3f8b270180	5.10内核仓代码适配 Signed-off-by: yaowenrui <yaowenrui2@huawei.com>	2024-08-14 15:54:54 +08:00