Ray Essick
360bd4fd75
Merge changes from topic "b124323156"
...
* changes:
Initialize all allocated memory blocks to zero
Update cfi blacklist to include few more assembly functions
LDR changed to MOV instruction in armv8 and armv7 assemblies
2019-04-02 22:13:05 +00:00
TreeHugger Robot
0efd8c81e2
Merge "Fix for array out of bound in ixheaacd_dec_execute"
2019-03-29 00:30:32 +00:00
TreeHugger Robot
4289ecda25
Merge "Fix for array and integer overflow in drc related functions"
2019-03-29 00:22:50 +00:00
Rajat Kumar
7b43401d30
Initialize all allocated memory blocks to zero
...
Bug: 124323156
Test: poc
Change-Id: I69b035d1b6bab81244dde319d4fceb3f42837380
2019-03-27 15:49:39 -07:00
Harish Mahendrakar
7a36f59037
Update cfi blacklist to include few more assembly functions
...
CFI doesn't handle indirect calls to assembly functions.
Few functions that called assembly functions weren't in the blacklist
which caused CFI errors in few CTS tests
Bug: 124323156
Test: atest android.media.cts.DecoderTest#testDecodeHeAacM4a
Test: poc
Change-Id: Id48404cfcf21353405b3d7676cc98d0d99763903
2019-03-27 15:49:29 -07:00
Rajat Kumar
91227e2f61
LDR changed to MOV instruction in armv8 and armv7 assemblies
...
Removes memory accesses to constant values and replaces
them with mov instructions. This would allow this library
to be compatible with execute-only memory layouts.
Bug: 124323156
Test: poc
Change-Id: I801d4cfff953b9d13b80a97be04a3223117df29f
2019-03-27 15:49:19 -07:00
Rajat Kumar
18eeb62fd1
Fix for memory leak in meta read file.
...
meta_info->ia_mp4_stsz_size once allocated, was never freed,
hence giving memory leaks.
As a fix, added free when decoder de-initializes and when
this memory is reallocated.
Bug:124831933
Test: vendor
Change-Id: Ie9465496fca15501bc7dffc29a4f6eccf3880e6d
2019-03-27 15:37:32 -07:00
Rajat Kumar
b338a5c649
Fix for array and integer overflow in drc related functions
...
Added init done check before execute calls to avoid access of
uninitialized data.
Bug:126652455
Test: poc
Change-Id: Ia33d05658d3830f27dfe607c4f4e96233c272e20
2019-03-27 13:44:19 -07:00
TreeHugger Robot
708b691836
Merge "Fix for addition overflow in voronoi_idx_dec"
2019-03-22 14:52:18 +00:00
Ramesh Katuri
d02fcccd4b
Fix for addition overflow in voronoi_idx_dec
...
Added saturation check in ixheaacd_avq_dec.c file.
Bug:126154841
Test: poc
Change-Id: I8fe1e1b194bdde2854bb3b41c2b8b9bf00afc125
2019-03-21 15:28:09 -07:00
Sushanth Patil
8f97584285
Fix for array out of bound in ixheaacd_dec_execute
...
Decode init fatal error was not handled at upper level in
ixheaacd_common_lpfuncs.c. Hence, corresponding check has
been added.
Bug:126154782
Test: poc
Change-Id: I5332f5fd0260110f426cfe176e6d64f5989cfb08
2019-03-21 15:21:51 -07:00
TreeHugger Robot
3e37d2f231
Merge "Fix for xaacdec running in infinite loop in hbe_repl_spec func."
2019-03-21 00:47:28 +00:00
Rajat Kumar
f931772f4a
Fix for xaacdec running in infinite loop in hbe_repl_spec func.
...
When ixheaacd_num_bands = 0, "while (patch_bands > 0)" goes
into infinite looping since patch_bands remains unchanged in the
loop.
So as a fix added the corresponding check to break the loop when
ixheaacd_num_bands becomes 0.
Bug: 123974524
Test: poc
Change-Id: Ie6364ad0b3cfd92df1a2664ec5850408aecce21b
2019-03-19 09:15:22 -07:00
TreeHugger Robot
68e7ffa52a
Merge "Fixes for integer overflows in ixheaacd_fft.c file."
2019-03-19 04:48:30 +00:00
Ramesh Katuri
b06bd79f1b
Fix for Heap buffer overflow in read bit buffer for latm stream
...
for latm stream other_data_length is read from the bit stream.
For this stream this value is becoming very high, which is beyond
bit buffer boundaries.
As a fix if the value is more than bit buffer size we are returning
fatal error.
Bug:124210105
Test: poc
Change-Id: Id93e5dbdbbd4aab428401da0ea72422d192bcdec
2019-03-16 16:02:47 -07:00
Rajat Kumar
976e950918
Fixes for integer overflows in ixheaacd_fft.c file.
...
Added addition and subtraction saturation checks
throughout ixheaacd_fft.c file.
Bug:124022940
Bug:124023732
Bug:124024270
Test: poc
Change-Id: Ie9fc7b1b301df968c7ba0b41b4b5532d2a957abd
2019-03-09 08:17:00 -08:00
TreeHugger Robot
eaf820d8f7
Merge "Fix for array out of bound access in multichannel.c file"
2019-03-09 04:32:25 +00:00
TreeHugger Robot
4e1da7999e
Merge "Fix integer overflows in ixheaacd_harm_idx_zerotwo and ixheaacd_harm_idx_onethree"
2019-03-08 19:31:46 +00:00
TreeHugger Robot
995c9b52c9
Merge "Fix for OOB write in ixheaacd_real_synth_filt."
2019-03-08 15:01:34 +00:00
TreeHugger Robot
7b0b01f14d
Merge "Fix for heap-buffer-overflow in ixheaacd_aac_showbits_32"
2019-03-08 14:57:21 +00:00
Rajat Kumar
a2e013254b
Fix for array out of bound access in multichannel.c file
...
Array common_gain_element_present was accessed with an index of 10,
so a check has been added as fix and error return code handling has
been modified.
Bug:124022181
Test: poc
Change-Id: Ic9be00f6a9cec2df433e7a5f86616da5e98c9e05
2019-03-01 17:56:08 -08:00
Xin Li
ee391b5dfa
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 03e306175d -s ours
...
am: b88540fc25
2019-02-25 17:14:39 -08:00
TreeHugger Robot
00cd0bb17c
Merge "Fix for multiplication overflow in voronoi_idx_dec function"
2019-02-26 00:16:29 +00:00
Xin Li
b88540fc25
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
am: 03e306175d
2019-02-25 16:11:35 -08:00
TreeHugger Robot
34571bd9d3
Merge "Fixes for integer overflow at many places in ixheaacd_qmf_dec.c file"
2019-02-25 20:14:38 +00:00
TreeHugger Robot
5833bdf746
Merge "Fix for out of bound array access in decode hcr_non_pcw function"
2019-02-25 17:46:14 +00:00
Rajat Kumar
63f32daf11
Fixes for integer overflow at many places in ixheaacd_qmf_dec.c file
...
the operations in the affected routines now use saturation.
Bug: 124022347
Test: vendor+poc
Change-Id: I3a9fcc39e01b576c3661ada4b8a14f90be456b1c
2019-02-24 20:05:49 -08:00
Ray Essick
e5eb426d1a
Merge changes from topic "xaac_b112709994"
...
* changes:
Fix for global buffer overflow in scale factor process function
Fix for NPD in ixheaacd_applysbr
2019-02-24 23:55:19 +00:00
Rajat Kumar
31bb626fb3
Fix for multiplication overflow in voronoi_idx_dec function
...
Multiplication by two is replaced by left shift by one and
saturate to avoid integer overflow.
Bug:124023736
Test: vendor+poc
Change-Id: I2b1ffead5f1c72106550d0b81d0cbd6c71acfde6
2019-02-22 21:17:30 -08:00
Rajat Kumar
076b008bea
Fix for out of bound array access in decode hcr_non_pcw function
...
Bug:123974741
Test: vendor+poc
Change-Id: Icbad136f3bc021fd0f96540cc24215818cf59d79
2019-02-22 19:09:34 -08:00
Tripti Tiwari
9a5461c37d
Fix for OOB write in ixheaacd_real_synth_filt.
...
In erroneous case, qmf_band_idx becomes negative,
causing synth table pointer corruption.
As fix, added bound check on qmf_band_idx.
Bug:118494320
Test: vendor
Change-Id: Ia16a0a879a5621676b7756d80d12f2c761bb020b
2019-02-22 18:51:11 -08:00
Ramesh Katuri
2c9929c4a3
Fix for heap-buffer-overflow in ixheaacd_aac_showbits_32
...
Better feedback from a bit reading routine, allowing separate offset
adjustments into buffer.
Bug:117610057
Test: vendor+poc
Change-Id: I3031cc50a727987512e2b8979fe14cbe23778245
2019-02-22 18:28:54 -08:00
TreeHugger Robot
468eb7debe
Merge "Cleanup memory allocation for DRC buffers"
2019-02-23 01:32:20 +00:00
Xin Li
03e306175d
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
Bug: 120848293
Change-Id: Iff33082b2278d272c5223063e715c9ee414350fe
2019-02-21 09:24:55 -08:00
Pirama Arumuga Nainar
266216e42b
Merge "Mark two inline functions as static" am: 624825bb2e am: cc99c427a1
...
am: 153f44de04
2019-02-20 11:18:20 -08:00
Xin Li
32d28ed489
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 9515c963b2 -s ours am: df4677dc06 -s ours
...
am: 7baa620813
2019-02-20 10:10:01 -08:00
Pirama Arumuga Nainar
153f44de04
Merge "Mark two inline functions as static" am: 624825bb2e
...
am: cc99c427a1
2019-02-20 10:06:21 -08:00
Pirama Arumuga Nainar
cc99c427a1
Merge "Mark two inline functions as static"
...
am: 624825bb2e
2019-02-20 10:01:02 -08:00
Xin Li
7baa620813
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 9515c963b2 -s ours
...
am: df4677dc06
2019-02-20 09:18:38 -08:00
Xin Li
df4677dc06
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
...
am: 9515c963b2
2019-02-20 08:40:43 -08:00
Pirama Arumuga Nainar
624825bb2e
Merge "Mark two inline functions as static"
2019-02-20 16:29:59 +00:00
Pirama Arumuga Nainar
0be5c447de
Mark two inline functions as static
...
Bug: http://b/116873221
Mark ixheaacd_init_sbr_tables and ixheaacd_filt_buf_update as static, so
clang emits an out-of-line definition for it. This fixes the coverage
build, that builds with O0, where the functions don't get inlined.
As an unrelated cleanup, remove an extra declaration of
ixheaacd_filt_buf_update.
Test: Build with coverage
Change-Id: Ia92f1d73c404193116fa3f269948027c771a43bf
2019-02-19 11:03:06 -08:00
Xin Li
9515c963b2
DO NOT MERGE - Merge PPRL.190205.001 into master
...
Bug: 124234733
Change-Id: Idf2c455397431a161059ddb1e1b6ac9836540b77
2019-02-18 15:58:25 -08:00
Xin Li
82832c1d66
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: 23fc663dec -s ours
...
am: d2253c8471
2019-02-14 20:58:29 -08:00
Xin Li
d2253c8471
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
am: 23fc663dec
2019-02-14 14:29:12 -08:00
Xin Li
23fc663dec
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
Bug: 124234733
Change-Id: I453f3d0a78f8e2b6d741fc057ef03e0da4556dc3
2019-02-12 09:53:35 -08:00
android-build-team Robot
50b8646b2a
Snap for 5180536 from d3e7258458 to pi-platform-release
...
Change-Id: Ida7dfb98393b178426963300990b2227047e2b82
2019-02-09 02:38:30 +00:00
Rajat Kumar
8913b0b126
Fix for global buffer overflow in scale factor process function
...
Bug: 112709994
Test: vendor
Change-Id: Ic201888327c62374a8fcb2b293ac47cd401fede4
2019-02-08 22:22:41 +00:00
TreeHugger Robot
1deaf88b6e
Merge "Fix for invalid memory access in ixheaacd_init_sbr access."
2019-02-08 20:33:18 +00:00
TreeHugger Robot
f986e101ae
Merge "Fix for integer overflow in ixheaacd_decode_init()"
2019-02-08 20:29:18 +00:00
