| commit | fb2f9cf8ced3f8beb2009f7ac2fe1f5bfdb9819e | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Mon Aug 02 21:12:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 02 21:12:26 2021 +0000 |
| tree | 2b529b8e094f5072a1366064c1a9b360f68a3335 | |
| parent | d8169eacb6fc463493e21d998088176edf1c6bf5 [diff] | |
| parent | 63b712dca5a7e23a8ba10d596e640d3a08aa63c8 [diff] |
Merge "libbinder: disallow upgrade of explicit version" am: a588da3ea7 am: e326a110b6 am: 2e1c1d4328 am: 63b712dca5 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1783312 Change-Id: Idb3166920b52ffbf7d0e0387a36cf1ea12c564c5
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; }