From 2a0a29d7eac7bb5c10207f45e3872a46a928dda9 Mon Sep 17 00:00:00 2001 From: lsq Date: Thu, 26 May 2022 16:44:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lsq Change-Id: I462015667a452d42c7cb09a36e16fc78762e8caa --- .../src/service/token_sync_manager_stub.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp index 5d15d5e29..727b2f6c2 100644 --- a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp +++ b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp @@ -55,6 +55,12 @@ int32_t TokenSyncManagerStub::OnRemoteRequest( void TokenSyncManagerStub::GetRemoteHapTokenInfoInner(MessageParcel& data, MessageParcel& reply) { + AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); + if ((reinterpret_cast(&tokenCaller))->type != TOKEN_NATIVE) { + ACCESSTOKEN_LOG_ERROR(LABEL, "%{public}s called, permission denied", __func__); + reply.WriteInt32(RET_FAILED); + return; + } std::string deviceID = data.ReadString(); AccessTokenID tokenID = data.ReadUint32(); @@ -65,6 +71,12 @@ void TokenSyncManagerStub::GetRemoteHapTokenInfoInner(MessageParcel& data, Messa void TokenSyncManagerStub::DeleteRemoteHapTokenInfoInner(MessageParcel& data, MessageParcel& reply) { + AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); + if ((reinterpret_cast(&tokenCaller))->type != TOKEN_NATIVE) { + ACCESSTOKEN_LOG_ERROR(LABEL, "%{public}s called, permission denied", __func__); + reply.WriteInt32(RET_FAILED); + return; + } std::string deviceID = data.ReadString(); AccessTokenID tokenID = data.ReadUint32(); int result = this->DeleteRemoteHapTokenInfo(tokenID); @@ -73,6 +85,12 @@ void TokenSyncManagerStub::DeleteRemoteHapTokenInfoInner(MessageParcel& data, Me void TokenSyncManagerStub::UpdateRemoteHapTokenInfoInner(MessageParcel& data, MessageParcel& reply) { + AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); + if ((reinterpret_cast(&tokenCaller))->type != TOKEN_NATIVE) { + ACCESSTOKEN_LOG_ERROR(LABEL, "%{public}s called, permission denied", __func__); + reply.WriteInt32(RET_FAILED); + return; + } sptr tokenInfoParcelPtr = data.ReadParcelable(); int result = RET_FAILED; if (tokenInfoParcelPtr != nullptr) { -- Gitee From 12ca59a4b9d6aa28a1f301b7168c8ff7da5cc484 Mon Sep 17 00:00:00 2001 From: lsq Date: Thu, 26 May 2022 19:35:02 +0800 Subject: [PATCH 2/3] Signed-off-by: lsq Change-Id: I20dcec903879cdbaca736631ef29fb16c2ae68de --- services/tokensyncmanager/include/remote/soft_bus_channel.h | 1 - 1 file changed, 1 deletion(-) diff --git a/services/tokensyncmanager/include/remote/soft_bus_channel.h b/services/tokensyncmanager/include/remote/soft_bus_channel.h index 169a5d74e..8c809bbe9 100644 --- a/services/tokensyncmanager/include/remote/soft_bus_channel.h +++ b/services/tokensyncmanager/include/remote/soft_bus_channel.h @@ -257,7 +257,6 @@ private: if (p - buf == bufSize) { return; } - n = 0; } // bind device id for this channel -- Gitee From d95c700ae4b0d5937a17f6877d79f58f8c00ec6d Mon Sep 17 00:00:00 2001 From: lsq Date: Thu, 26 May 2022 19:37:57 +0800 Subject: [PATCH 3/3] Signed-off-by: lsq Change-Id: I9820727471f83bc08727a59cfdbae6fd9c6314e6 --- services/tokensyncmanager/include/remote/soft_bus_channel.h | 1 + 1 file changed, 1 insertion(+) diff --git a/services/tokensyncmanager/include/remote/soft_bus_channel.h b/services/tokensyncmanager/include/remote/soft_bus_channel.h index 8c809bbe9..169a5d74e 100644 --- a/services/tokensyncmanager/include/remote/soft_bus_channel.h +++ b/services/tokensyncmanager/include/remote/soft_bus_channel.h @@ -257,6 +257,7 @@ private: if (p - buf == bufSize) { return; } + n = 0; } // bind device id for this channel -- Gitee