Add null check before adding iface to pointer vector
If there is a failure in nan iface creation, nullptr is being
added to iface vector which is further leading to nullptr dereference
while iterating over the vector. Avoid adding nullptr to vector
if the iface creation fails. Also, add null check to pointer
before dereferencing it.
Bug: 356562924
Test: m
Change-Id: Ic0995aba592720f26a23d27b4e9387ab3dc86c7d
Signed-off-by: Manaswini Paluri <quic_mpaluri@quicinc.com>
diff --git a/wifi/aidl/default/wifi_chip.cpp b/wifi/aidl/default/wifi_chip.cpp
index 9b9c565..fccfc15 100644
--- a/wifi/aidl/default/wifi_chip.cpp
+++ b/wifi/aidl/default/wifi_chip.cpp
@@ -62,7 +62,9 @@
std::vector<std::string> getNames(std::vector<std::shared_ptr<Iface>>& ifaces) {
std::vector<std::string> names;
for (const auto& iface : ifaces) {
- names.emplace_back(iface->getName());
+ if (iface) {
+ names.emplace_back(iface->getName());
+ }
}
return names;
}
@@ -971,6 +973,10 @@
}
std::shared_ptr<WifiNanIface> iface =
WifiNanIface::create(ifname, is_dedicated_iface, legacy_hal_, iface_util_);
+ if (!iface) {
+ LOG(ERROR) << "Unable to create NAN iface";
+ return {nullptr, createWifiStatus(WifiStatusCode::ERROR_UNKNOWN)};
+ }
nan_ifaces_.push_back(iface);
for (const auto& callback : event_cb_handler_.getCallbacks()) {
if (!callback->onIfaceAdded(IfaceType::NAN_IFACE, ifname).isOk()) {