OSDN Git Service
Wei Jia [Thu, 3 Dec 2015 18:02:24 +0000 (18:02 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
6afc659b00 am:
9e1d7751b1 -s ours
am:
4c0d243626
* commit '
4c0d24362609e9aa9f4f6afe6ee483d3d939f663':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Thu, 3 Dec 2015 17:56:44 +0000 (17:56 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am:
6afc659b00
am:
9e1d7751b1 -s ours
* commit '
9e1d7751b12ea976323abc1fe7760323ab142d39':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Thu, 3 Dec 2015 17:53:24 +0000 (17:53 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
am:
6afc659b00
* commit '
6afc659b00c3f4a83b9f5f3c744b7119b33340b4':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Thu, 3 Dec 2015 17:50:17 +0000 (17:50 +0000)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
am:
0462975291
* commit '
0462975291796e414891e04bcec9da993914e458':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Wei Jia [Fri, 20 Nov 2015 18:34:35 +0000 (10:34 -0800)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Bug:
25812794
Change-Id: I96dc74734380d462583f6efa33d09946f9532809
(cherry picked from commit
87f8cbb223ee516803dbb99699320c2484cbf3ba)
Wei Jia [Fri, 20 Nov 2015 18:34:35 +0000 (10:34 -0800)]
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Bug:
25812794
Change-Id: I96dc74734380d462583f6efa33d09946f9532809
(cherry picked from commit
87f8cbb223ee516803dbb99699320c2484cbf3ba)
Wei Jia [Thu, 22 Oct 2015 20:14:25 +0000 (20:14 +0000)]
GenericSource: reset mDecryptHandle when mDataSource is cleared.
am:
09c291c838
* commit '
09c291c838bc74bb7c10c22f7232abb946cad8ff':
GenericSource: reset mDecryptHandle when mDataSource is cleared.
Wei Jia [Thu, 22 Oct 2015 18:35:04 +0000 (11:35 -0700)]
GenericSource: reset mDecryptHandle when mDataSource is cleared.
Bug:
25070434
Change-Id: Ib0eb6a419683a0e686a4f63b82e9300cb1f69484
(cherry picked from commit
cdc9cf656a8e43875234cb021fffeb4792d7c74e)
Wei Jia [Wed, 21 Oct 2015 20:40:28 +0000 (20:40 +0000)]
GenericSource: reset mDrmManagerClient when mDataSource is cleared.
am:
224858e719
* commit '
224858e719d045c8554856b12c4ab73d2375cf33':
GenericSource: reset mDrmManagerClient when mDataSource is cleared.
Wei Jia [Mon, 19 Oct 2015 23:14:14 +0000 (16:14 -0700)]
GenericSource: reset mDrmManagerClient when mDataSource is cleared.
Bug:
25070434
Change-Id: Iade3472c496ac42456e42db35e402f7b66416f5b
(cherry picked from commit
b41fd0d4929f0a89811bafcc4fd944b128f00ce2)
Jon Larimer [Tue, 20 Oct 2015 21:27:55 +0000 (21:27 +0000)]
Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am:
b1a13d01dc am:
781cd4f37d
am:
8565726f57
* commit '
8565726f5775a6db97a394aa18a1f6b0e1ce69b7':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
Jon Larimer [Tue, 20 Oct 2015 21:19:00 +0000 (21:19 +0000)]
Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am:
b1a13d01dc
am:
781cd4f37d
* commit '
781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
Jon Larimer [Tue, 20 Oct 2015 21:12:16 +0000 (21:12 +0000)]
Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev
am:
b1a13d01dc
* commit '
b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
Jon Larimer [Tue, 20 Oct 2015 20:55:20 +0000 (20:55 +0000)]
Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" into klp-dev
Lajos Molnar [Mon, 19 Oct 2015 19:21:59 +0000 (12:21 -0700)]
am
f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev
* commit '
f70b69a8b5ed044112516bf69f69905e521070b6':
stagefright: check bounds for MediaCodecList.getCodecInfo
Lajos Molnar [Mon, 19 Oct 2015 19:17:30 +0000 (19:17 +0000)]
Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev
Glenn Kasten [Wed, 14 Oct 2015 20:50:22 +0000 (20:50 +0000)]
am
56d193ac: am
5a018d15: (-s ours) am
0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev
* commit '
56d193acbec3c387a9d479df003b41362bcf3644':
DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
Glenn Kasten [Wed, 14 Oct 2015 20:46:29 +0000 (20:46 +0000)]
am
5a018d15: (-s ours) am
0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev
* commit '
5a018d15da438933c30de4b25bcff527331cf8df':
DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
Glenn Kasten [Wed, 14 Oct 2015 20:40:42 +0000 (20:40 +0000)]
am
0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev
* commit '
0f21a6880e74b56834940a131df912a49b70e82d':
DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
Glenn Kasten [Wed, 14 Oct 2015 20:37:45 +0000 (20:37 +0000)]
am
55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev
* commit '
55d1ea47c8aac1d5c6e887e06e8c36bf40eca7d7':
DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
Glenn Kasten [Wed, 14 Oct 2015 20:30:55 +0000 (20:30 +0000)]
Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev
Glenn Kasten [Wed, 14 Oct 2015 20:30:40 +0000 (20:30 +0000)]
Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev
Andy Hung [Tue, 13 Oct 2015 18:25:48 +0000 (18:25 +0000)]
am
e5326d96: Merge "DO NOT MERGE - audio policy: fix commit
dea1541f" into lmp-dev
* commit '
e5326d965afc8941f85c866ae8dcdc8884c9709c':
DO NOT MERGE - audio policy: fix commit
dea1541f
Andy Hung [Tue, 13 Oct 2015 18:21:28 +0000 (18:21 +0000)]
Merge "DO NOT MERGE - audio policy: fix commit
dea1541f" into lmp-dev
Andy Hung [Tue, 13 Oct 2015 00:50:38 +0000 (00:50 +0000)]
am
d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev
* commit '
d1c9037aec7db782077c5a0dbbe09bc55836ec85':
DO NOT MERGE - audio policy: validate stream type received from binder calls.
Andy Hung [Tue, 13 Oct 2015 00:46:20 +0000 (00:46 +0000)]
Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev
Lajos Molnar [Tue, 13 Oct 2015 00:10:31 +0000 (17:10 -0700)]
stagefright: check bounds for MediaCodecList.getCodecInfo
Bug:
24445127
Change-Id: I1c6cb9e2518b852d48d5d0d625b54409bd4e13ec
Wei Jia [Thu, 8 Oct 2015 16:57:52 +0000 (16:57 +0000)]
am
0b1936be: am
dd184a48: (-s ours) am
3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev
* commit '
0b1936bee532545381db6adf22f31ac437673f30':
DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
Wei Jia [Thu, 8 Oct 2015 16:53:23 +0000 (16:53 +0000)]
am
dd184a48: (-s ours) am
3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev
* commit '
dd184a4824acc31160895e2c6f8d93a7facfc2c8':
DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
Wei Jia [Thu, 8 Oct 2015 16:48:33 +0000 (16:48 +0000)]
am
3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev
* commit '
3b4a72acf039c58c33807b6d6fcdd5e09eafb1df':
DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
Wei Jia [Thu, 8 Oct 2015 16:42:25 +0000 (16:42 +0000)]
am
04c02eeb: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into lmp-dev
* commit '
04c02eeb0e5e5e4829df6946b275a770a8443330':
DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
Wei Jia [Thu, 8 Oct 2015 16:37:35 +0000 (16:37 +0000)]
Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into lmp-dev
Wei Jia [Thu, 8 Oct 2015 16:37:26 +0000 (16:37 +0000)]
Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev
Wei Jia [Mon, 28 Sep 2015 18:32:23 +0000 (11:32 -0700)]
DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
Bug:
24310423
Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3
(cherry picked from commit
8dde7269a5356503d2b283234b6cb46d0c3f214e)
Wei Jia [Mon, 28 Sep 2015 18:32:23 +0000 (11:32 -0700)]
DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
Bug:
24310423
Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3
(cherry picked from commit
8dde7269a5356503d2b283234b6cb46d0c3f214e)
Wei Jia [Tue, 6 Oct 2015 22:28:01 +0000 (22:28 +0000)]
am
b75a78db: am
fc0e2a87: am
7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
* commit '
b75a78db916a7becf7e1b5ad15c0b4e667ef4661':
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
Wei Jia [Tue, 6 Oct 2015 22:23:18 +0000 (22:23 +0000)]
am
fc0e2a87: am
7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
* commit '
fc0e2a87c17b1f326b5e3302e8f534c143fd5784':
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
Wei Jia [Tue, 6 Oct 2015 22:17:52 +0000 (22:17 +0000)]
am
7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
* commit '
7ed8d1eff9b292b3c65a875b13a549e29654534b':
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
Wei Jia [Mon, 5 Oct 2015 17:44:23 +0000 (10:44 -0700)]
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
Bug:
24623447
Change-Id: Ifbc74454d6e28ad7136efe35ab638a07e46398b1
(cherry picked from commit
b3694ff5a5bcecd4b6cedca156f6effb55bbf4ca)
Marco Nelissen [Tue, 6 Oct 2015 20:05:28 +0000 (20:05 +0000)]
am
07395f4c: am
00f5fa82: am
74d1927e: Merge "Check NAL size before use" into klp-dev
* commit '
07395f4cd72cf29d1de2864cde42876db4e54411':
Check NAL size before use
Marco Nelissen [Tue, 6 Oct 2015 17:03:00 +0000 (17:03 +0000)]
am
00f5fa82: am
74d1927e: Merge "Check NAL size before use" into klp-dev
* commit '
00f5fa82d884c0ca41ee08e7a67ab54238109083':
Check NAL size before use
Marco Nelissen [Tue, 6 Oct 2015 16:45:37 +0000 (16:45 +0000)]
am
74d1927e: Merge "Check NAL size before use" into klp-dev
* commit '
74d1927e4122a1748f89ca2ef79406fc06ee94b2':
Check NAL size before use
Wei Jia [Tue, 6 Oct 2015 16:45:37 +0000 (16:45 +0000)]
am
df68d9d5: am
60b25aa0: am
9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev
* commit '
df68d9d5bf5329bc2f7effb6afa1d3904eaf30d8':
MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
Wei Jia [Tue, 6 Oct 2015 16:38:51 +0000 (16:38 +0000)]
am
60b25aa0: am
9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev
* commit '
60b25aa0c173854593743dd85588c7449baf87c0':
MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
Marco Nelissen [Tue, 6 Oct 2015 16:34:45 +0000 (16:34 +0000)]
Merge "Check NAL size before use" into klp-dev
Wei Jia [Tue, 6 Oct 2015 16:34:00 +0000 (16:34 +0000)]
am
9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev
* commit '
9ab9c85e39f089f355faa9cd9db6d113dc482e61':
MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
Wei Jia [Tue, 6 Oct 2015 16:21:35 +0000 (16:21 +0000)]
Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev
Marco Nelissen [Tue, 6 Oct 2015 16:00:00 +0000 (16:00 +0000)]
am
13b6b51e: am
f7d1f627: am
257b3bc5: Don\'t crash when there\'s no conceal frame
* commit '
13b6b51e6d9c399f0bfa55be4eecaf47b63845f2':
Don't crash when there's no conceal frame
Marco Nelissen [Tue, 6 Oct 2015 15:54:38 +0000 (15:54 +0000)]
am
f7d1f627: am
257b3bc5: Don\'t crash when there\'s no conceal frame
* commit '
f7d1f627b0b1139f82f16baee482476cc10ccde4':
Don't crash when there's no conceal frame
Marco Nelissen [Tue, 6 Oct 2015 15:47:51 +0000 (15:47 +0000)]
am
257b3bc5: Don\'t crash when there\'s no conceal frame
* commit '
257b3bc581bbc65318a4cc2d3c22a07a4429dc1d':
Don't crash when there's no conceal frame
Marco Nelissen [Fri, 2 Oct 2015 22:12:00 +0000 (15:12 -0700)]
Check NAL size before use
Bug:
24441553
Bug:
24445122
Change-Id: Ib7f025769adbafd5a2cb64fae5562a0a565945c2
Wei Jia [Mon, 28 Sep 2015 21:50:47 +0000 (14:50 -0700)]
MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
Bug:
24346430
Change-Id: I897a724e968841d9160f819d06c0ce22f6d743c4
(cherry picked from commit
5cae16bdce77b0a3ba590b55637f7d55a2f35402)
Marco Nelissen [Mon, 5 Oct 2015 17:46:11 +0000 (10:46 -0700)]
Don't crash when there's no conceal frame
Bug:
24630158
Change-Id: If042aebebb58c218eb7bbf01dcddbcbd05dca1d6
Lajos Molnar [Tue, 1 Sep 2015 00:19:52 +0000 (17:19 -0700)]
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
Bug:
21725583
Change-Id: I799c1967759c7e49fb50281a1708188450caac77
(cherry picked from commit
cf75af8f76265fb2909028f5dc68c7029dbe5f49)
Flanker [Tue, 29 Sep 2015 06:42:26 +0000 (06:42 +0000)]
am
91f5dc8f: am
bdaee5ea: (-s ours) am
3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel
* commit '
91f5dc8fce9c37239216a01d78d771ef7592baa2':
DO NOT MERGE stagefright: fix AMessage::FromParcel
Flanker [Tue, 29 Sep 2015 06:36:16 +0000 (06:36 +0000)]
am
bdaee5ea: (-s ours) am
3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel
* commit '
bdaee5eaa345ee9b1e5ddcb921565c4d127ceb8d':
DO NOT MERGE stagefright: fix AMessage::FromParcel
Flanker [Tue, 29 Sep 2015 06:28:47 +0000 (06:28 +0000)]
am
3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel
* commit '
3737a3fa121796131ea5b782230e65dad9ccf90f':
DO NOT MERGE stagefright: fix AMessage::FromParcel
Flanker [Tue, 29 Sep 2015 06:20:01 +0000 (06:20 +0000)]
am
2b8cd9cb: stagefright: fix AMessage::FromParcel
* commit '
2b8cd9cbb3e72ffd048ffdd1609fac74f61a22ac':
stagefright: fix AMessage::FromParcel
Flanker [Fri, 11 Sep 2015 11:05:47 +0000 (19:05 +0800)]
DO NOT MERGE stagefright: fix AMessage::FromParcel
Add check for incoming mNumItems. Also add check readCString return
value.
Fix style & add log.
Bug:
24123723
Change-Id: If41a5312c27d868f481893eef56019b6807c39b7
Flanker [Fri, 11 Sep 2015 11:05:47 +0000 (19:05 +0800)]
stagefright: fix AMessage::FromParcel
Add check for incoming mNumItems. Also add check readCString return
value.
Fix style & add log.
Bug:
24123723
Change-Id: If41a5312c27d868f481893eef56019b6807c39b7
Andy Hung [Thu, 24 Sep 2015 22:08:13 +0000 (15:08 -0700)]
DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
Bug:
24211743
Bug:
24267152
Change-Id: I58c55e56b85067b71e4e300f947b4dfc159637ba
Andy Hung [Thu, 24 Sep 2015 23:36:56 +0000 (16:36 -0700)]
DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
Bug:
24211743
Bug:
24267152
Change-Id: I58c55e56b85067b71e4e300f947b4dfc159637ba
Wei Jia [Thu, 17 Sep 2015 21:42:12 +0000 (21:42 +0000)]
am
a8f90d57: Merge "IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel." into lmp-dev
* commit '
a8f90d57f5b3ad4ef7194501aa20f0a0bd903e8f':
IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel.
Wei Jia [Thu, 17 Sep 2015 21:32:32 +0000 (21:32 +0000)]
Merge "IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel." into lmp-dev
Jeff Tinker [Thu, 17 Sep 2015 17:44:52 +0000 (17:44 +0000)]
am
fb5104ec: am
4554ffd7: (-s ours) am
6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev
* commit '
fb5104ec0cc11a50d1a56224cd1ca2950c2def45':
DO NOT MERGE Fix vulnerability in mediaserver
Jeff Tinker [Thu, 17 Sep 2015 17:44:51 +0000 (17:44 +0000)]
am
48904845: am
52b829cb: (-s ours) am
f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev
* commit '
48904845e16b9b18b75e6c75726f94ab49c7a1f8':
Fix for security vulnerability in media server DO NOT MERGE
Jeff Tinker [Thu, 17 Sep 2015 17:38:12 +0000 (17:38 +0000)]
am
4554ffd7: (-s ours) am
6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev
* commit '
4554ffd7a1c4bc6973c11c00f5a19aa260e18100':
DO NOT MERGE Fix vulnerability in mediaserver
Jeff Tinker [Thu, 17 Sep 2015 17:38:11 +0000 (17:38 +0000)]
am
52b829cb: (-s ours) am
f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev
* commit '
52b829cbc2cb947733f312211a007ecd2f9fe96b':
Fix for security vulnerability in media server DO NOT MERGE
Jeff Tinker [Thu, 17 Sep 2015 17:28:47 +0000 (17:28 +0000)]
am
6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev
* commit '
6272fa1baf361a6a89607243638cc592047947b3':
DO NOT MERGE Fix vulnerability in mediaserver
Jeff Tinker [Thu, 17 Sep 2015 17:28:46 +0000 (17:28 +0000)]
am
f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev
* commit '
f43125ed08a408b02613b99f058564d97ce690cc':
Fix for security vulnerability in media server DO NOT MERGE
Jeff Tinker [Thu, 17 Sep 2015 17:21:35 +0000 (17:21 +0000)]
am
160ed868: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev
* commit '
160ed868d6beb0d55dc2194564d2f08cc9d6fbc2':
DO NOT MERGE Fix vulnerability in mediaserver
Jeff Tinker [Thu, 17 Sep 2015 17:21:34 +0000 (17:21 +0000)]
am
99e63e75: Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev
* commit '
99e63e75b670aeca1b4af401cb9582ba9fddf64d':
Fix for security vulnerability in media server DO NOT MERGE
Jeff Tinker [Thu, 17 Sep 2015 17:04:32 +0000 (17:04 +0000)]
Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev
Jeff Tinker [Thu, 17 Sep 2015 17:04:25 +0000 (17:04 +0000)]
Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev
Jeff Tinker [Thu, 17 Sep 2015 17:04:15 +0000 (17:04 +0000)]
Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev
Jeff Tinker [Thu, 17 Sep 2015 17:04:05 +0000 (17:04 +0000)]
Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev
Wei Jia [Wed, 16 Sep 2015 22:01:16 +0000 (15:01 -0700)]
IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel.
Bug:
23953967
Change-Id: I3a1d0144ba3832649e322c197ff0f03305ee7829
(cherry picked from commit
4cac44b53cc9f965cc2c9706b1d7ee2cd79f4066)
Wei Jia [Thu, 17 Sep 2015 13:49:44 +0000 (13:49 +0000)]
am
13a8c5dd: am
190786d3: (-s ours) am
ae922517: Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into klp-dev
* commit '
13a8c5dd7f7437da67ecf8e2886e486191e95ff2':
DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.
Wei Jia [Thu, 17 Sep 2015 13:42:56 +0000 (13:42 +0000)]
am
190786d3: (-s ours) am
ae922517: Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into klp-dev
* commit '
190786d3590c6b064a7d32eaa92f4a7b11cf16d5':
DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.
Wei Jia [Thu, 17 Sep 2015 13:36:52 +0000 (13:36 +0000)]
am
ae922517: Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into klp-dev
* commit '
ae92251730865e0c4bc59ef2a8fe9dacb6de41b9':
DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.
Wei Jia [Thu, 17 Sep 2015 13:27:37 +0000 (13:27 +0000)]
am
21fda3ed: Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into lmp-dev
* commit '
21fda3ed3b6346f5b3711f663e5d79bc379398df':
DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.
Wei Jia [Thu, 17 Sep 2015 13:19:23 +0000 (13:19 +0000)]
Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into lmp-dev
Wei Jia [Thu, 17 Sep 2015 13:19:08 +0000 (13:19 +0000)]
Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into klp-dev
Eric Laurent [Thu, 30 Oct 2014 21:59:13 +0000 (14:59 -0700)]
DO NOT MERGE - audio policy: fix commit
dea1541f
Fix return types in early returns added by
commit
dea1541f in AudioPolicy binder call methods.
Also fix former similar mistakes found nearby.
Bug:
18001784.
Bug:
18002005.
Change-Id: I088c6029ca04e2c2c2f78e560c9cb6b9576dd88f
Eric Laurent [Tue, 28 Oct 2014 22:46:45 +0000 (15:46 -0700)]
DO NOT MERGE - audio policy: validate stream type received from binder calls.
Bug:
18001784.
Bug:
18002005.
Change-Id: I8efa674dceff5a6e10251b1c7a55e9bb2d532395
(cherry picked from commit
dea1541fc0042abf05674b19c2f94ca086945dfd)
Jeff Tinker [Wed, 16 Sep 2015 18:48:13 +0000 (18:48 +0000)]
am
d61dbb36: am
38281f1c: am
d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
* commit '
d61dbb36a673a8278eb7d63e53215b2cff804f4b':
Fix heap data leak vulnerability
Jeff Tinker [Wed, 16 Sep 2015 18:40:49 +0000 (18:40 +0000)]
am
38281f1c: am
d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
* commit '
38281f1cbcd4804095828f19b7954d5219560fcd':
Fix heap data leak vulnerability
Jeff Tinker [Wed, 16 Sep 2015 18:33:58 +0000 (18:33 +0000)]
am
d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
* commit '
d386c5be9505d2db24048a6e08ab714f2151dac2':
Fix heap data leak vulnerability
Jeff Tinker [Wed, 16 Sep 2015 18:17:46 +0000 (18:17 +0000)]
Merge "Fix heap data leak vulnerability" into klp-dev
Jeff Tinker [Wed, 16 Sep 2015 17:26:28 +0000 (10:26 -0700)]
DO NOT MERGE Fix vulnerability in mediaserver
ICrypto.cpp: ASLR bypass using DECRYPT IPC
bug:
24074485
Change-Id: Ia12942d6b86adde28745908d36a728ab5d69a037
Jeff Tinker [Wed, 16 Sep 2015 17:23:12 +0000 (10:23 -0700)]
DO NOT MERGE Fix vulnerability in mediaserver
ICrypto.cpp: ASLR bypass using DECRYPT IPC
bug:
24074485
Change-Id: I40dd0e92083c7093030393b16dbab59323306a4e
Wei Jia [Thu, 10 Sep 2015 16:47:29 +0000 (09:47 -0700)]
DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.
Bug:
23953967
Change-Id: Ibbe841da149038675e9e8daea76c77558bc8564b
(cherry picked from commit
983dca391a76fb45df999fc40e8766b9ddb63511)
Wei Jia [Thu, 10 Sep 2015 16:47:29 +0000 (09:47 -0700)]
DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.
Bug:
23953967
Change-Id: Ibbe841da149038675e9e8daea76c77558bc8564b
(cherry picked from commit
983dca391a76fb45df999fc40e8766b9ddb63511)
Wonsik Kim [Wed, 16 Sep 2015 07:51:22 +0000 (07:51 +0000)]
am
cc0942d0: am
9860dcdf: (-s ours) am
b21a6420: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev
* commit '
cc0942d0c2a57c5025063c62689ee01b39736dc2':
DO NOT MERGE NuCachedSource2: fix possible erroneous early free
Wonsik Kim [Wed, 16 Sep 2015 07:43:55 +0000 (07:43 +0000)]
am
9860dcdf: (-s ours) am
b21a6420: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev
* commit '
9860dcdf427d70e6aef4ce082be40a5459c466f4':
DO NOT MERGE NuCachedSource2: fix possible erroneous early free
Wonsik Kim [Wed, 16 Sep 2015 07:37:16 +0000 (07:37 +0000)]
am
b21a6420: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev
* commit '
b21a642067477c72f419956da0ca8dafe0c04eab':
DO NOT MERGE NuCachedSource2: fix possible erroneous early free
Wonsik Kim [Wed, 16 Sep 2015 07:22:19 +0000 (07:22 +0000)]
am
5c09132b: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into lmp-dev
* commit '
5c09132bf4d7e789256c9723fe2dfa15a6947bbb':
DO NOT MERGE NuCachedSource2: fix possible erroneous early free
Wonsik Kim [Wed, 16 Sep 2015 07:11:18 +0000 (07:11 +0000)]
Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into lmp-dev
Wonsik Kim [Wed, 16 Sep 2015 07:11:04 +0000 (07:11 +0000)]
Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev
Jeff Tinker [Mon, 14 Sep 2015 20:55:23 +0000 (13:55 -0700)]
Fix heap data leak vulnerability
bug:
23600291
Change-Id: I7979e9e25ada01c13775be8580d433a8b4ce4ffe
OSDN Git Service
