!1192 【修复】OAT告警

Merge pull request !1192 from 石子怡/master
修复OAT告警
2024-05-27 11:37:41 +00:00 · 2024-05-25 02:30:55 +00:00 · 2024-05-25 01:33:58 +00:00 · 2024-05-11 03:01:05 +00:00 · 2024-05-10 20:05:39 +08:00 · 2024-03-26 07:19:04 +00:00
3 changed files with 9 additions and 3 deletions
--- a/OAT.xml
+++ b/OAT.xml
@@ -65,6 +65,8 @@
                <!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
            </filefilter>
            <filefilter name="binaryFileTypePolicyFilter" desc="Filters for binary file policies">
+                <filteritem type="filepath" name="figures/architecture-of-the-openharmony-liteos-cortex-a-kernel.png" desc="architecture-of-the-openharmony-liteos-cortex-a-kernel"/>
+                <filteritem type="filepath" name="figures/OpenHarmony-LiteOS-A内核架构图.png" desc="LiteOS-A内核架构图"/>
                <!--filteritem type="filename" name="*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
                <!--filteritem type="filepath" name="abcdefg/.*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
                <!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
--- a/compat/posix/src/mqueue.c
+++ b/compat/posix/src/mqueue.c
@@ -604,17 +604,19 @@ int OsMqGetAttr(mqd_t personal, struct mq_attr *mqAttr)
    struct mqarray *mqueueCB = NULL;
    struct mqpersonal *privateMqPersonal = NULL;

+    (VOID)pthread_mutex_lock(&IPC_QUEUE_MUTEX);
    privateMqPersonal = MqGetPrivDataBuff(personal);
    if (privateMqPersonal == NULL) {
+        (VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
        return -1;
    }

    if (mqAttr == NULL) {
        errno = EINVAL;
+        (VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
        return -1;
    }

-    (VOID)pthread_mutex_lock(&IPC_QUEUE_MUTEX);
    if (privateMqPersonal->mq_status != MQ_USE_MAGIC) {
        errno = EBADF;
        (VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
@@ -634,17 +636,19 @@ int OsMqSetAttr(mqd_t personal, const struct mq_attr *mqSetAttr, struct mq_attr
 {
    struct mqpersonal *privateMqPersonal = NULL;

+    (VOID)pthread_mutex_lock(&IPC_QUEUE_MUTEX);
    privateMqPersonal = MqGetPrivDataBuff(personal);
    if (privateMqPersonal == NULL) {
+        (VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
        return -1;
    }

    if (mqSetAttr == NULL) {
        errno = EINVAL;
+        (VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
        return -1;
    }

-    (VOID)pthread_mutex_lock(&IPC_QUEUE_MUTEX);
    if (privateMqPersonal->mq_status != MQ_USE_MAGIC) {
        errno = EBADF;
        (VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
--- a/kernel/base/ipc/los_queue_debug.c
+++ b/kernel/base/ipc/los_queue_debug.c
@@ -103,7 +103,7 @@ STATIC VOID SortQueueIndexArray(UINT32 *indexArray, UINT32 count)
    IpcSortParam queueSortParam;
    queueSortParam.buf = (CHAR *)g_queueDebugArray;
    queueSortParam.ipcDebugCBSize = sizeof(QueueDebugCB);
-    queueSortParam.ipcDebugCBCnt = LOSCFG_BASE_IPC_SEM_LIMIT;
+    queueSortParam.ipcDebugCBCnt = LOSCFG_BASE_IPC_QUEUE_LIMIT;
    queueSortParam.sortElemOff = LOS_OFF_SET_OF(QueueDebugCB, lastAccessTime);

    if (count > 0) {
Author	SHA1	Message	Date
openharmony_ci	7fcec6797c	!1192 【修复】OAT告警 Merge pull request !1192 from 石子怡/master	2024-05-27 11:37:41 +00:00
石子怡	dff8682d4d	修复OAT告警 Signed-off-by: 石子怡 <z15319797139@163.com>	2024-05-25 02:30:55 +00:00
石子怡	b0520a56f4	修复OAT告警 Signed-off-by: 石子怡 <z15319797139@163.com>	2024-05-25 01:33:58 +00:00
openharmony_ci	180bf8e5cd	!1189 内核mqueue 竞争漏洞修复 Merge pull request !1189 from hw_llm/master	2024-05-11 03:01:05 +00:00
hw_llm	dbbb96c427	Description: liteos_a 内核竞争漏洞修复 IssueNo: https://gitee.com/openharmony/kernel_liteos_a/issues/I9OACM Feature Or Bugfix: Bugfix Binary Source: No Signed-off-by: hw_llm <liu.limin@huawei.com>	2024-05-10 20:05:39 +08:00
openharmony_ci	e3eaae1b1c	!1184 【轻量级 PR】：修改 SortQueueIndexArray 函数笔误 Merge pull request !1184 from brucezhao/N/A	2024-03-26 07:19:04 +00:00
brucezhao	a235c4c106	修改 SortQueueIndexArray 函数笔误修改 SortQueueIndexArray 函数 queueSortParam.ipcDebugCBCnt = LOSCFG_BASE_IPC_SEM_LIMIT; 的笔误为 LOSCFG_BASE_IPC_QUEUE_LIMIT Signed-off-by: brucezhao <bruce.e.zhao@gmail.com>	2023-11-24 07:57:04 +00:00