e637aa32b8
There exists the following race condition: a). thread A receives setNotify and sets the callback to some object b). thread B of the wrapped implementation calls BiometricsFingerprint::notify which it was given a handle to. Thread B executes past the nullptr check: c). thread A receives setNotify and sets the callback to some other object (or nullptr) d). thread B resumes in notify with unknown state Add mutex to protect access to mClientCallback. Change-Id: I9163204ff5802e9246056caeb2a7857e6138531c Fixes: 64802340 Test: VtsHalBiometricsFingerprintV2_1IfaceFuzzer
84 lines
3.4 KiB
C++
84 lines
3.4 KiB
C++
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
|
|
#define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
|
|
|
|
#include <log/log.h>
|
|
#include <android/log.h>
|
|
#include <hardware/hardware.h>
|
|
#include <hardware/fingerprint.h>
|
|
#include <hidl/MQDescriptor.h>
|
|
#include <hidl/Status.h>
|
|
#include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h>
|
|
|
|
namespace android {
|
|
namespace hardware {
|
|
namespace biometrics {
|
|
namespace fingerprint {
|
|
namespace V2_1 {
|
|
namespace implementation {
|
|
|
|
using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint;
|
|
using ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback;
|
|
using ::android::hardware::biometrics::fingerprint::V2_1::RequestStatus;
|
|
using ::android::hardware::Return;
|
|
using ::android::hardware::Void;
|
|
using ::android::hardware::hidl_vec;
|
|
using ::android::hardware::hidl_string;
|
|
using ::android::sp;
|
|
|
|
struct BiometricsFingerprint : public IBiometricsFingerprint {
|
|
public:
|
|
BiometricsFingerprint();
|
|
~BiometricsFingerprint();
|
|
|
|
// Method to wrap legacy HAL with BiometricsFingerprint class
|
|
static IBiometricsFingerprint* getInstance();
|
|
|
|
// Methods from ::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint follow.
|
|
Return<uint64_t> setNotify(const sp<IBiometricsFingerprintClientCallback>& clientCallback) override;
|
|
Return<uint64_t> preEnroll() override;
|
|
Return<RequestStatus> enroll(const hidl_array<uint8_t, 69>& hat, uint32_t gid, uint32_t timeoutSec) override;
|
|
Return<RequestStatus> postEnroll() override;
|
|
Return<uint64_t> getAuthenticatorId() override;
|
|
Return<RequestStatus> cancel() override;
|
|
Return<RequestStatus> enumerate() override;
|
|
Return<RequestStatus> remove(uint32_t gid, uint32_t fid) override;
|
|
Return<RequestStatus> setActiveGroup(uint32_t gid, const hidl_string& storePath) override;
|
|
Return<RequestStatus> authenticate(uint64_t operationId, uint32_t gid) override;
|
|
|
|
private:
|
|
static fingerprint_device_t* openHal();
|
|
static void notify(const fingerprint_msg_t *msg); /* Static callback for legacy HAL implementation */
|
|
static Return<RequestStatus> ErrorFilter(int32_t error);
|
|
static FingerprintError VendorErrorFilter(int32_t error, int32_t* vendorCode);
|
|
static FingerprintAcquiredInfo VendorAcquiredFilter(int32_t error, int32_t* vendorCode);
|
|
static BiometricsFingerprint* sInstance;
|
|
|
|
std::mutex mClientCallbackMutex;
|
|
sp<IBiometricsFingerprintClientCallback> mClientCallback;
|
|
fingerprint_device_t *mDevice;
|
|
};
|
|
|
|
} // namespace implementation
|
|
} // namespace V2_1
|
|
} // namespace fingerprint
|
|
} // namespace biometrics
|
|
} // namespace hardware
|
|
} // namespace android
|
|
|
|
#endif // ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
|