Add a sanity check for attestation challenge length before returning (#…

…15429) The challenge should always be exactly 16 bytes.
project-chip · Feb 25, 2022 · b88e2df · b88e2df
1 parent 0b12cd3
commit b88e2df
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -598,6 +598,7 @@ JNI_METHOD(jbyteArray, getAttestationChallenge)
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
     err                                      = wrapper->Controller()->GetAttestationChallenge(attestationChallenge);
     SuccessOrExit(err);
+    VerifyOrExit(attestationChallenge.size() == 16, err = CHIP_ERROR_INVALID_ARGUMENT);
 
     err = JniReferences::GetInstance().N2J_ByteArray(env, attestationChallenge.data(), attestationChallenge.size(),
                                                      attestationChallengeJbytes);