diff options
author | Kevin Rocard <krocard@google.com> | 2019-05-20 15:04:49 -0700 |
---|---|---|
committer | Kevin Rocard <krocard@google.com> | 2019-05-21 00:27:09 +0000 |
commit | dbb7d0d3049feb2151fec510a4002ff5068262cf (patch) | |
tree | 897637034d164acf3d374abb5dde2f67af1a9d86 /audio | |
parent | 9ace2c9788797abf7f688028d5e25f8388200fa0 (diff) | |
download | android_hardware_interfaces-dbb7d0d3049feb2151fec510a4002ff5068262cf.tar.gz android_hardware_interfaces-dbb7d0d3049feb2151fec510a4002ff5068262cf.tar.bz2 android_hardware_interfaces-dbb7d0d3049feb2151fec510a4002ff5068262cf.zip |
Validate HAL mic input
Input value were not checked, resulting in out of range input accepted.
This was checked by test but never implemented in the default HAL.
Bug: 133105753
Test: atest VtsHalAudioV5_0Target
Change-Id: Ie6dae638b60daff6923668dc9637067f29e48b21
Signed-off-by: Kevin Rocard <krocard@google.com>
Diffstat (limited to 'audio')
-rw-r--r-- | audio/common/all-versions/util/include/common/all-versions/HidlSupport.h | 34 | ||||
-rw-r--r-- | audio/core/all-versions/default/StreamIn.cpp | 10 |
2 files changed, 44 insertions, 0 deletions
diff --git a/audio/common/all-versions/util/include/common/all-versions/HidlSupport.h b/audio/common/all-versions/util/include/common/all-versions/HidlSupport.h new file mode 100644 index 000000000..b514a43a8 --- /dev/null +++ b/audio/common/all-versions/util/include/common/all-versions/HidlSupport.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2019 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_audio_common_HidlSupport_H_ +#define android_hardware_audio_common_HidlSupport_H_ + + +#include <hidl/HidlSupport.h> +#include <algorithm> + +namespace android::hardware::audio::common::utils { + +template <typename Enum> +bool isValidHidlEnum(Enum e) { + hidl_enum_range<Enum> values; + return std::find(values.begin(), values.end(), e) != values.end(); +} + +} // namespace android::hardware::audio::common::utils + +#endif // android_hardware_audio_common_HidlSupport_H_ diff --git a/audio/core/all-versions/default/StreamIn.cpp b/audio/core/all-versions/default/StreamIn.cpp index daba6f7ef..d316f8361 100644 --- a/audio/core/all-versions/default/StreamIn.cpp +++ b/audio/core/all-versions/default/StreamIn.cpp @@ -19,6 +19,7 @@ #include "core/default/StreamIn.h" #include "core/default/Conversions.h" #include "core/default/Util.h" +#include "common/all-versions/HidlSupport.h" //#define LOG_NDEBUG 0 #define ATRACE_TAG ATRACE_TAG_AUDIO @@ -27,6 +28,7 @@ #include <hardware/audio.h> #include <utils/Trace.h> #include <memory> +#include <cmath> namespace android { namespace hardware { @@ -501,6 +503,10 @@ Return<Result> StreamIn::setMicrophoneDirection(MicrophoneDirection direction) { if (mStream->set_microphone_direction == nullptr) { return Result::NOT_SUPPORTED; } + if (!common::utils::isValidHidlEnum(direction)) { + ALOGE("%s: Invalid direction %d", __func__, direction); + return Result::INVALID_ARGUMENTS; + } return Stream::analyzeStatus( "set_microphone_direction", mStream->set_microphone_direction( @@ -511,6 +517,10 @@ Return<Result> StreamIn::setMicrophoneFieldDimension(float zoom) { if (mStream->set_microphone_field_dimension == nullptr) { return Result::NOT_SUPPORTED; } + if (std::isnan(zoom) || zoom < -1 || zoom > 1) { + ALOGE("%s: Invalid zoom %f", __func__, zoom); + return Result::INVALID_ARGUMENTS; + } return Stream::analyzeStatus("set_microphone_field_dimension", mStream->set_microphone_field_dimension(mStream, zoom)); } |