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

Unverified Commit 19462c37 authored by LuK1337's avatar LuK1337 Committed by Michael Bestas
Browse files

fpc: Fix potential nullptr derefs 

If we fail to load the module, it's better to just return errors instead
of crashing. This can happen when the fpc sensor is broken.

Change-Id: I88df93401298a0d4ac47e2583d7d9c7b14516737
parent 416b0c30

biometrics/fingerprint/2.1/default/BiometricsFingerprint.cpp

+36 −0
Original line number Diff line number Diff line
@@ -155,33 +155,61 @@ Return<uint64_t> BiometricsFingerprint::setNotify( 
}



Return<uint64_t> BiometricsFingerprint::preEnroll()  {

    if (mDevice == nullptr) {

        ALOGE("No valid device");

        return 0;

    }

    return mDevice->pre_enroll(mDevice);

}



Return<RequestStatus> BiometricsFingerprint::enroll(const hidl_array<uint8_t, 69>& hat,

        uint32_t gid, uint32_t timeoutSec) {

    if (mDevice == nullptr) {

        ALOGE("No valid device");

        return RequestStatus::SYS_UNKNOWN;

    }

    const hw_auth_token_t* authToken =

        reinterpret_cast<const hw_auth_token_t*>(hat.data());

    return ErrorFilter(mDevice->enroll(mDevice, authToken, gid, timeoutSec));

}



Return<RequestStatus> BiometricsFingerprint::postEnroll() {

    if (mDevice == nullptr) {

        ALOGE("No valid device");

        return RequestStatus::SYS_UNKNOWN;

    }

    return ErrorFilter(mDevice->post_enroll(mDevice));

}



Return<uint64_t> BiometricsFingerprint::getAuthenticatorId() {

    if (mDevice == nullptr) {

        ALOGE("No valid device");

        return 0;

    }

    return mDevice->get_authenticator_id(mDevice);

}



Return<RequestStatus> BiometricsFingerprint::cancel() {

    if (mDevice == nullptr) {

        ALOGE("No valid device");

        return RequestStatus::SYS_UNKNOWN;

    }

    return ErrorFilter(mDevice->cancel(mDevice));

}



Return<RequestStatus> BiometricsFingerprint::enumerate()  {

    if (mDevice == nullptr) {

        ALOGE("No valid device");

        return RequestStatus::SYS_UNKNOWN;

    }

    return ErrorFilter(mDevice->enumerate(mDevice));

}



Return<RequestStatus> BiometricsFingerprint::remove(uint32_t gid, uint32_t fid) {

    if (mDevice == nullptr) {

        ALOGE("No valid device");

        return RequestStatus::SYS_UNKNOWN;

    }

    return ErrorFilter(mDevice->remove(mDevice, gid, fid));

}
@@ -194,6 +222,10 @@ Return<RequestStatus> BiometricsFingerprint::setActiveGroup(uint32_t gid, 
    if (access(storePath.c_str(), W_OK)) {

        return RequestStatus::SYS_EINVAL;

    }

    if (mDevice == nullptr) {

        ALOGE("No valid device");

        return RequestStatus::SYS_UNKNOWN;

    }



    return ErrorFilter(mDevice->set_active_group(mDevice, gid,

                                                    storePath.c_str()));
@@ -201,6 +233,10 @@ Return<RequestStatus> BiometricsFingerprint::setActiveGroup(uint32_t gid, 


Return<RequestStatus> BiometricsFingerprint::authenticate(uint64_t operationId,

        uint32_t gid) {

    if (mDevice == nullptr) {

        ALOGE("No valid device");

        return RequestStatus::SYS_UNKNOWN;

    }

    return ErrorFilter(mDevice->authenticate(mDevice, operationId, gid));

}