commit | 63b712dca5a7e23a8ba10d596e640d3a08aa63c8 | [log] [tgz] |
---|---|---|
author | Steven Moreland <smoreland@google.com> | Mon Aug 02 21:01:27 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 02 21:01:27 2021 +0000 |
tree | 415316098e5d070381c1594bfa2f1ed6c53ce2d4 | |
parent | 4fea0ff0d223293722c3544637c041d9471dc847 [diff] | |
parent | 2e1c1d4328b95e25399f443c33e56bd59241495d [diff] |
Merge "libbinder: disallow upgrade of explicit version" am: a588da3ea7 am: e326a110b6 am: 2e1c1d4328 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1783312 Change-Id: I5142926e96edfb5dbf52f21e60de58f215168bb2
diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp index 90ce4d6..254b99c 100644 --- a/libs/binder/RpcSession.cpp +++ b/libs/binder/RpcSession.cpp
@@ -87,6 +87,12 @@ } std::lock_guard<std::mutex> _l(mMutex); + if (mProtocolVersion && version > *mProtocolVersion) { + ALOGE("Cannot upgrade explicitly capped protocol version %u to newer version %u", + *mProtocolVersion, version); + return false; + } + mProtocolVersion = version; return true; }