commit | 63ceab92c4ebd36397888c7edba32c09a715cd59 | [log] [tgz] |
---|---|---|
author | Paul Colta <donpaul@google.com> | Thu Jun 01 21:10:59 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 01 21:10:59 2023 +0000 |
tree | ca048030c03559f3c077796a3067bb93e1c7628c | |
parent | 4addda03ce3d07eb00bf0b0831741b7b96ca7e1b [diff] | |
parent | c35015dc8c241992b8e7f2db15a9cd378589d1fd [diff] |
HDMICEC: Out of Bounds Write in sendMessage in HdmiCec.cpp am: a93bdd0578 am: e8fccd25c9 am: c35015dc8c Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23486967 Change-Id: I42dbbd5401c64bb78a5457bb0ef81f46893d2435 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tv/cec/1.0/default/HdmiCec.cpp b/tv/cec/1.0/default/HdmiCec.cpp index 74de785..f05f610 100644 --- a/tv/cec/1.0/default/HdmiCec.cpp +++ b/tv/cec/1.0/default/HdmiCec.cpp
@@ -307,6 +307,9 @@ } Return<SendMessageResult> HdmiCec::sendMessage(const CecMessage& message) { + if (message.body.size() > CEC_MESSAGE_BODY_MAX_LENGTH) { + return SendMessageResult::FAIL; + } cec_message_t legacyMessage { .initiator = static_cast<cec_logical_address_t>(message.initiator), .destination = static_cast<cec_logical_address_t>(message.destination),