!1190 【Pick】【OH-4.0-Release】解决竞争冲突

Merge pull request !1190 from hw_llm/cherry-pick-1715399454
fixed dbbb96c from https://gitee.com/hw_llm/kernel_liteos_a/pulls/1189
2024-05-23 12:01:24 +00:00 · 2024-05-11 03:50:54 +00:00 · 2023-07-26 02:39:24 +00:00 · 2023-07-26 09:35:58 +08:00
2 changed files with 7 additions and 3 deletions
--- 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/core/los_swtmr.c
+++ b/kernel/base/core/los_swtmr.c
@@ -583,7 +583,7 @@ STATIC INLINE BOOL SwtmrRunqueueFind(SortLinkAttribute *swtmrSortLink, SCHED_TL_
 STATIC BOOL SwtmrTimeListFind(SCHED_TL_FIND_FUNC checkFunc, UINTPTR arg)
 {
    for (UINT16 cpuid = 0; cpuid < LOSCFG_KERNEL_CORE_NUM; cpuid++) {
-        SortLinkAttribute *swtmrSortLink = &g_swtmrRunqueue[ArchCurrCpuid()].swtmrSortLink;
+        SortLinkAttribute *swtmrSortLink = &g_swtmrRunqueue[cpuid].swtmrSortLink;
        if (SwtmrRunqueueFind(swtmrSortLink, checkFunc, arg)) {
            return TRUE;
        }
Author	SHA1	Message	Date
openharmony_ci	1848f31fdf	!1190 【Pick】【OH-4.0-Release】解决竞争冲突 Merge pull request !1190 from hw_llm/cherry-pick-1715399454	2024-05-23 12:01:24 +00:00
hw_llm	dfc582aecd	fixed `dbbb96c` from https://gitee.com/hw_llm/kernel_liteos_a/pulls/1189 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-11 03:50:54 +00:00
openharmony_ci	0bc453c2cd	!1169 修复swtmr遍历不全导致的用例问题 Merge pull request !1169 from wangchen/0726_a	2023-07-26 02:39:24 +00:00
wangchen	73bcf0ec9a	Fix: 修复swtmr只在当前核遍历链表的问题 Close #I7NZDT Signed-off-by: wangchen <wangchen240@huawei.com>	2023-07-26 09:35:58 +08:00