From 65f70558066d4ea0ef6cacc599f5a7964261c567 Mon Sep 17 00:00:00 2001
From: shenpeixing <shenpeixing2@huawei.com>
Date: Thu, 26 Jun 2025 15:40:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=81=B6=E7=8E=B0clear?=
 =?UTF-8?q?=E5=85=8D=E6=89=93=E6=89=B0=E7=99=BD=E5=90=8D=E5=8D=95crash?=
 =?UTF-8?q?=E4=B8=8Etdd=E4=B8=AD=E6=9C=89crash=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: shenpeixing <shenpeixing2@huawei.com>
---
 .../include/vibration_priority_manager.h          |  1 +
 .../src/vibration_priority_manager.cpp            |  2 ++
 utils/common/src/file_utils.cpp                   | 15 +++++++++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/services/miscdevice_service/include/vibration_priority_manager.h b/services/miscdevice_service/include/vibration_priority_manager.h
index 3f5bd43..f727f86 100644
--- a/services/miscdevice_service/include/vibration_priority_manager.h
+++ b/services/miscdevice_service/include/vibration_priority_manager.h
@@ -135,6 +135,7 @@ private:
     std::vector<WhiteListAppInfo> doNotDisturbWhiteList_;
     sptr<MiscDeviceObserver> currentUserObserver_;
     std::mutex currentUserObserverMutex_;
+    std::mutex whiteListMutex_;
 #endif // OHOS_BUILD_ENABLE_DO_NOT_DISTURB
 #ifdef OHOS_BUILD_ENABLE_VIBRATOR_CROWN
     std::atomic_int32_t miscCrownFeedback_ = FEEDBACK_MODE_INVALID;
diff --git a/services/miscdevice_service/src/vibration_priority_manager.cpp b/services/miscdevice_service/src/vibration_priority_manager.cpp
index 2cada5a..865fb5f 100644
--- a/services/miscdevice_service/src/vibration_priority_manager.cpp
+++ b/services/miscdevice_service/src/vibration_priority_manager.cpp
@@ -151,6 +151,7 @@ void VibrationPriorityManager::InitDoNotDisturbData()
         doNotDisturbSwitch_ = switchTemp;
         MISC_HILOGI("doNotDisturbSwitch:%{public}d", switchTemp);
     }
+    std::lock_guard<std::mutex> whiteListLock(whiteListMutex_);
     if (doNotDisturbSwitch_ == DONOTDISTURB_SWITCH_ON) {
         std::vector<WhiteListAppInfo> whiteListTemp;
         int32_t whiteListRet = GetWhiteListValue(DO_NOT_DISTURB_WHITE_LIST, whiteListTemp);
@@ -443,6 +444,7 @@ bool VibrationPriorityManager::IgnoreAppVibrations(const VibrateInfo &vibrateInf
         MISC_HILOGD("DoNotDisturbSwitch is off");
         return false;
     }
+    std::lock_guard<std::mutex> whiteListLock(whiteListMutex_);
     for (const WhiteListAppInfo &whiteListAppInfo : doNotDisturbWhiteList_) {
         if (vibrateInfo.packageName == whiteListAppInfo.bundle) {
             MISC_HILOGD("Not ignore app vibration, the app is on the whitelist, bundleName::%{public}s",
diff --git a/utils/common/src/file_utils.cpp b/utils/common/src/file_utils.cpp
index 78419ef..fff2eac 100755
--- a/utils/common/src/file_utils.cpp
+++ b/utils/common/src/file_utils.cpp
@@ -187,16 +187,23 @@ std::string ReadFd(const RawFileDescriptor &rawFd)
     int64_t fdSize = GetFileSize(rawFd.fd);
     if ((rawFd.offset < 0) || (rawFd.offset > fdSize)) {
         MISC_HILOGE("offset is invalid, offset:%{public}" PRId64, rawFd.offset);
-        close(rawFd.fd);
         return {};
     }
     if ((rawFd.length <= 0) || (rawFd.length > fdSize - rawFd.offset)) {
         MISC_HILOGE("length is invalid, length:%{public}" PRId64, rawFd.length);
-        close(rawFd.fd);
         return {};
     }
-    FILE *fp = fdopen(rawFd.fd, "r");
-    CHKPS(fp);
+    int dupFd = dup(rawFd.fd);
+    if (dupFd < 0) {
+        MISC_HILOGE("dup fd failed, fd:%{public}d, errno:%{public}d", rawFd.fd, errno);
+        return {};
+    }
+    FILE *fp = fdopen(dupFd, "r");
+    if (fp == nullptr) {
+        MISC_HILOGE("fdopen failed, fd:%{public}d, errno:%{public}d", dupFd, errno);
+        close(dupFd);
+        return {};
+    }
     if (fseek(fp, rawFd.offset, SEEK_SET) != 0) {
         MISC_HILOGE("fseek failed, errno:%{public}d", errno);
         if (fclose(fp) != 0) {
-- 
Gitee