commit fc8e987a5373bc5ab9273442330d9024c9ecab00
author Mark Salyzyn <salyzyn@google.com> Fri Nov 20 09:30:29 2020 -0800
committer Huizi Yang <yanghuiz@google.com> Wed Dec 09 15:53:28 2020 -0800
tree 01f0a492458363b79d5b73563de5e513cc342da7
parent 3a20da65394e1ccadfeff11a77b4a47eac9824ce

storaged: protect global proto_loaded

proto_loaded is not thread safe, so we must protect it with
a mutex proto_lock.

Signed-off-by: hanhongli@360.cn
Signed-off-by: gongguang@360.cn
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 170732441
Test: compile
Change-Id: I93416598b6047e890c66b922b360093aa42db8c5
(cherry picked from commit 33206d393c59437da3a4defad8f4c1578ec369bd)

storaged/include/storaged.h

diff --git a/storaged/include/storaged.h b/storaged/include/storaged.h
index 400e734..a3d05e5 100644
--- a/storaged/include/storaged.h
+++ b/storaged/include/storaged.h
@@ -87,6 +87,7 @@
     sp<android::hardware::health::V2_0::IHealth> health;
     unique_ptr<storage_info_t> storage_info;
     static const uint32_t current_version;
+    Mutex proto_lock;
     unordered_map<userid_t, bool> proto_loaded;
     void load_proto(userid_t user_id);
     char* prepare_proto(userid_t user_id, StoragedProto* proto);

storaged/storaged.cpp

diff --git a/storaged/storaged.cpp b/storaged/storaged.cpp
index 24d7de2..53da6a3 100644
--- a/storaged/storaged.cpp
+++ b/storaged/storaged.cpp
@@ -163,6 +163,8 @@
 }
 
 void storaged_t::add_user_ce(userid_t user_id) {
+    Mutex::Autolock _l(proto_lock);
+
     if (!proto_loaded[user_id]) {
         load_proto(user_id);
         proto_loaded[user_id] = true;
@@ -170,6 +172,8 @@
 }
 
 void storaged_t::remove_user_ce(userid_t user_id) {
+    Mutex::Autolock _l(proto_lock);
+
     proto_loaded[user_id] = false;
     mUidm.clear_user_history(user_id);
     RemoveFileIfExists(proto_path(user_id), nullptr);
@@ -300,6 +304,8 @@
 }
 
 void storaged_t::flush_protos(unordered_map<int, StoragedProto>* protos) {
+    Mutex::Autolock _l(proto_lock);
+
     for (auto& it : *protos) {
         /*
          * Don't flush proto if we haven't attempted to load it from file.