diff options
| author | Sasha Levitskiy <sanek@google.com> | 2015-06-18 16:08:14 -0700 |
|---|---|---|
| committer | Sasha Levitskiy <sanek@google.com> | 2015-06-22 13:16:51 -0700 |
| commit | 99115b9148b214671af7da56ff3a1d238a3cf0c1 (patch) | |
| tree | 46be589f95b0f37c6ae5912f3d4c6157e06c6ef8 /fingerprintd | |
| parent | 1cddc2092f544c5eac339e59746436facfdd5dc7 (diff) | |
| download | system_core-99115b9148b214671af7da56ff3a1d238a3cf0c1.zip system_core-99115b9148b214671af7da56ff3a1d238a3cf0c1.tar.gz system_core-99115b9148b214671af7da56ff3a1d238a3cf0c1.tar.bz2 | |
Fingerprint: Safeguard against empty paths.
Bug 21930029
Change-Id: I116f4ec333d25406ba811fec7331cbf9ff1a4027
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Diffstat (limited to 'fingerprintd')
| -rw-r--r-- | fingerprintd/FingerprintDaemonProxy.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fingerprintd/FingerprintDaemonProxy.cpp b/fingerprintd/FingerprintDaemonProxy.cpp index a55f30a..4c8e478 100644 --- a/fingerprintd/FingerprintDaemonProxy.cpp +++ b/fingerprintd/FingerprintDaemonProxy.cpp @@ -160,8 +160,8 @@ uint64_t FingerprintDaemonProxy::getAuthenticatorId() { int32_t FingerprintDaemonProxy::setActiveGroup(int32_t groupId, const uint8_t* path, ssize_t pathlen) { - if (pathlen >= PATH_MAX) { - ALOGE("Path name is too long\n"); + if (pathlen >= PATH_MAX || pathlen <= 0) { + ALOGE("Bad path length: %zd", pathlen); return -1; } // Convert to null-terminated string @@ -170,7 +170,6 @@ int32_t FingerprintDaemonProxy::setActiveGroup(int32_t groupId, const uint8_t* p path_name[pathlen] = '\0'; ALOG(LOG_VERBOSE, LOG_TAG, "setActiveGroup(%d, %s, %zu)", groupId, path_name, pathlen); return mDevice->set_active_group(mDevice, groupId, path_name); - return -1; } int64_t FingerprintDaemonProxy::openHal() { |