commit a696f19de84eebe242a022b52be6af592a22bf69
author Paul Colta <donpaul@google.com> Thu Feb 23 10:44:32 2023 +0100
committer Paul Colța <donpaul@google.com> Thu Feb 23 16:48:47 2023 +0000
tree 3123cd417f288d6e6d6f9cc79f9d4f8b2995db7c
parent 06543485d924fef89c0aff52a867f5263d348dd6

Handle portId out of bounds index

Bug: 268631136
Test: m && m android.hardware.tv.cec@1.0-impl && m android.hardware.tv.cec@1.0
Change-Id: I454caf56c309aae9667afd0e58da453002458a80
(cherry picked from commit 588b958ce1b50d42581e67a664b32e2f25f37712)

tv/cec/1.0/default/HdmiCecDefault.cpp

diff --git a/tv/cec/1.0/default/HdmiCecDefault.cpp b/tv/cec/1.0/default/HdmiCecDefault.cpp
index 26ccb7d..2a5197c 100644
--- a/tv/cec/1.0/default/HdmiCecDefault.cpp
+++ b/tv/cec/1.0/default/HdmiCecDefault.cpp
@@ -278,6 +278,10 @@
 
 Return<bool> HdmiCecDefault::isConnected(int32_t portId) {
     uint16_t addr;
+    if (portId < 0 || portId >= mHdmiCecPorts.size()) {
+        LOG(ERROR) << "Port id is out of bounds, portId = " << portId;
+        return false;
+    }
     int ret = ioctl(mHdmiCecPorts[portId]->mCecFd, CEC_ADAP_G_PHYS_ADDR, &addr);
     if (ret) {
         LOG(ERROR) << "Is connected failed, Error = " << strerror(errno);