!1235 hidumper 漏洞修复

Merge pull request !1235 from hw_llm/master
Description: hidumper 漏洞修复
2024-09-29 14:20:21 +00:00 · 2024-09-29 17:41:35 +08:00 · 2024-09-29 09:12:37 +00:00 · 2024-09-29 16:09:45 +08:00 · 2024-09-24 01:11:34 +00:00 · 2024-09-23 20:01:13 +08:00
3 changed files with 5 additions and 3 deletions
--- a/drivers/char/mem/src/mem.c
+++ b/drivers/char/mem/src/mem.c
@@ -61,7 +61,7 @@ static ssize_t MemMap(struct file *filep, LosVmMapRegion *region)
    VADDR_T vaddr = region->range.base;
    LosVmSpace *space = LOS_SpaceGet(vaddr);

-    if ((paddr >= SYS_MEM_BASE) && (paddr < SYS_MEM_END)) {
+    if (((paddr + size) >= SYS_MEM_BASE) && (paddr < SYS_MEM_END)) {
        return -EINVAL;
    }

--- a/kernel/extended/hidumper/los_hidumper.c
+++ b/kernel/extended/hidumper/los_hidumper.c
@@ -278,7 +278,6 @@ static void DumpFaultLog(void)

 static void DumpMemData(struct MemDumpParam *param)
 {
-    PRINTK("\nDumpType: %d\n", param->type);
    PRINTK("Unsupported now!\n");
 }

--- a/kernel/extended/liteipc/hm_liteipc.c
+++ b/kernel/extended/liteipc/hm_liteipc.c
@@ -758,7 +758,10 @@ LITE_OS_SEC_TEXT STATIC UINT32 HandlePtr(LosProcessCB *pcb, SpecialObj *obj, BOO
        obj->content.ptr.buff = (VOID *)GetIpcUserAddr(pcb, (INTPTR)buf);
        EnableIpcNodeFreeByUser(pcb, (VOID *)buf);
    } else {
-        (VOID)LiteIpcNodeFree(pcb, (VOID *)GetIpcKernelAddr(pcb, (INTPTR)obj->content.ptr.buff));
+        buf = (VOID *)GetIpcKernelAddr(pcb, (INTPTR)obj->content.ptr.buff);
+        if (IsIpcNode(pcb, buf) == TRUE) {
+            (VOID)LiteIpcNodeFree(pcb, buf);
+        }
    }
    return LOS_OK;
 }
Author	SHA1	Message	Date
openharmony_ci	51428fb84a	!1235 hidumper 漏洞修复 Merge pull request !1235 from hw_llm/master	2024-09-29 14:20:21 +00:00
hw_llm	31da79ec80	Description: hidumper 漏洞修复 IssueNo: https://gitee.com/openharmony/kernel_liteos_a/issues/IAUKD9 Feature Or Bugfix: Bugfix Binary Source: No Signed-off-by: hw_llm <liu.limin@huawei.com>	2024-09-29 17:41:35 +08:00
openharmony_ci	88cfb3de9d	!1232 mem 漏洞修复 Merge pull request !1232 from hw_llm/master	2024-09-29 09:12:37 +00:00
hw_llm	4bb465f9af	Description: mem 漏洞修复 IssueNo: https://gitee.com/openharmony/kernel_liteos_a/issues/IAUJDR Feature Or Bugfix: Bugfix Binary Source: No Signed-off-by: hw_llm <liu.limin@huawei.com>	2024-09-29 16:09:45 +08:00
openharmony_ci	ef7610470c	!1229 liteipc 解决释放后使用问题 Merge pull request !1229 from hw_llm/master	2024-09-24 01:11:34 +00:00
hw_llm	8b57198526	Description: liteipc 解决释放后使用问题 IssueNo: https://gitee.com/openharmony/kernel_liteos_a/issues/IAT2X3 Feature Or Bugfix: Bugfix Binary Source: No Signed-off-by: hw_llm <liu.limin@huawei.com>	2024-09-23 20:01:13 +08:00