zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix of integer overflow in WebRtcAecm_ProcessBlock / ApmTest.Process

Browse Source 
This CL includes the patch from oprypin@webrtc.org, which is also applied
to the MIPS code (also affected), and the protobuf for ApmTest.Process
(audio_processing_unittest.cc), which used when WEBRTC_AUDIOPROC_FIXED_PROFILE
is set.

This change has been tested on mobile platforms.

Bug: webrtc:8200
Change-Id: Ic50a5ab57c16551397756b1fb473e1067b8e7ece
Reviewed-on: https://webrtc-review.googlesource.com/10811
Reviewed-by: Per Åhgren <peah@webrtc.org>
Commit-Queue: Alessio Bazzica <alessiob@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20394}
This commit is contained in:
Alessio Bazzica
2017-10-16 13:45:58 +02:00
committed by Commit Bot
parent f92d871f4f
commit ba68aabb06
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/audio_processing/aecm/aecm_core_c.cc
View File

@ -24,6 +24,7 @@ extern "C" {
} }
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/safe_conversions.h"
#include "rtc_base/sanitizer.h" #include "rtc_base/sanitizer.h"
#include "typedefs.h" // NOLINT(build/include) #include "typedefs.h" // NOLINT(build/include)
@ -454,8 +455,8 @@ WebRtcAecm_ProcessBlock(AecmCore* aecm,
// Far end signal through channel estimate in Q8 // Far end signal through channel estimate in Q8
// How much can we shift right to preserve resolution // How much can we shift right to preserve resolution
tmp32no1 = echoEst32[i] - aecm->echoFilt[i]; tmp32no1 = echoEst32[i] - aecm->echoFilt[i];
aecm->echoFilt[i] += (tmp32no1 * 50) >> 8; aecm->echoFilt[i] +=
// UBSan: 72293096 * 50 cannot be represented in type 'int' rtc::dchecked_cast<int32_t>((int64_t{tmp32no1} * 50) >> 8);
zeros32 = WebRtcSpl_NormW32(aecm->echoFilt[i]) + 1; zeros32 = WebRtcSpl_NormW32(aecm->echoFilt[i]) + 1;
zeros16 = WebRtcSpl_NormW16(supGain) + 1; zeros16 = WebRtcSpl_NormW16(supGain) + 1;

4
modules/audio_processing/aecm/aecm_core_mips.cc
View File

@ -13,6 +13,7 @@
#include "modules/audio_processing/aecm/echo_control_mobile.h" #include "modules/audio_processing/aecm/echo_control_mobile.h"
#include "modules/audio_processing/utility/delay_estimator_wrapper.h" #include "modules/audio_processing/utility/delay_estimator_wrapper.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/safe_conversions.h"
static const ALIGN8_BEG int16_t WebRtcAecm_kSqrtHanning[] ALIGN8_END = { static const ALIGN8_BEG int16_t WebRtcAecm_kSqrtHanning[] ALIGN8_END = {
0, 399, 798, 1196, 1594, 1990, 2386, 2780, 3172, 0, 399, 798, 1196, 1594, 1990, 2386, 2780, 3172,
@ -966,7 +967,8 @@ int WebRtcAecm_ProcessBlock(AecmCore* aecm,
// Far end signal through channel estimate in Q8 // Far end signal through channel estimate in Q8
// How much can we shift right to preserve resolution // How much can we shift right to preserve resolution
tmp32no1 = echoEst32[i] - aecm->echoFilt[i]; tmp32no1 = echoEst32[i] - aecm->echoFilt[i];
aecm->echoFilt[i] += (tmp32no1 * 50) >> 8; aecm->echoFilt[i] +=
rtc::dchecked_cast<int32_t>((int64_t{tmp32no1} * 50) >> 8);
zeros32 = WebRtcSpl_NormW32(aecm->echoFilt[i]) + 1; zeros32 = WebRtcSpl_NormW32(aecm->echoFilt[i]) + 1;
zeros16 = WebRtcSpl_NormW16(supGain) + 1; zeros16 = WebRtcSpl_NormW16(supGain) + 1;

2
resources/audio_processing/output_data_fixed.pb.sha1
View File

@ -1 +1 @@
19e4b68ee2fecd4652fde54d43b6331ef90f3ef1 7d9a02619aa4a3095ee8d48697bffef8437e6fe0