Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb64aa59 authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge "[AWARE] Protect string copy against buffer overflow"

parents c2a29950 1cefaf62

wifi/1.4/default/hidl_struct_util.cpp

+14 −2
Original line number Diff line number Diff line
@@ -1822,7 +1822,13 @@ bool convertHidlNanDataPathInitiatorRequestToLegacy( 
        convertHidlNanDataPathChannelCfgToLegacy(

            hidl_request.channelRequestType);

    legacy_request->channel = hidl_request.channel;

    strcpy(legacy_request->ndp_iface, hidl_request.ifaceName.c_str());

    if (strnlen(hidl_request.ifaceName.c_str(), IFNAMSIZ + 1) == IFNAMSIZ + 1) {

        LOG(ERROR) << "convertHidlNanDataPathInitiatorRequestToLegacy: "

                      "ifaceName too long";

        return false;

    }

    strncpy(legacy_request->ndp_iface, hidl_request.ifaceName.c_str(),

            IFNAMSIZ + 1);

    legacy_request->ndp_cfg.security_cfg =

        (hidl_request.securityConfig.securityType !=

         NanDataPathSecurityType::OPEN)
@@ -1903,7 +1909,13 @@ bool convertHidlNanDataPathIndicationResponseToLegacy( 
                                   ? legacy_hal::NAN_DP_REQUEST_ACCEPT

                                   : legacy_hal::NAN_DP_REQUEST_REJECT;

    legacy_request->ndp_instance_id = hidl_request.ndpInstanceId;

    strcpy(legacy_request->ndp_iface, hidl_request.ifaceName.c_str());

    if (strnlen(hidl_request.ifaceName.c_str(), IFNAMSIZ + 1) == IFNAMSIZ + 1) {

        LOG(ERROR) << "convertHidlNanDataPathIndicationResponseToLegacy: "

                      "ifaceName too long";

        return false;

    }

    strncpy(legacy_request->ndp_iface, hidl_request.ifaceName.c_str(),

            IFNAMSIZ + 1);

    legacy_request->ndp_cfg.security_cfg =

        (hidl_request.securityConfig.securityType !=

         NanDataPathSecurityType::OPEN)