Dongwon Kang
58d53f6c28
[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7ba
am: dce12d183a
am: ad0ec9b3af
am: fc7a3a56f9
am: 25e9dff25c
am: e8d5d152bf
am: 1ff39c654a
am: e5d3086f3b
am: 301a0078a8
am: 77c35f6cac
...
am: 22eab8fecd
Change-Id: Id2135d79c7293256c74e6966f6add4bbdccb0621
6 years ago
Dongwon Kang
22eab8fecd
[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7ba
am: dce12d183a
am: ad0ec9b3af
am: fc7a3a56f9
am: 25e9dff25c
am: e8d5d152bf
am: 1ff39c654a
am: e5d3086f3b
am: 301a0078a8
...
am: 77c35f6cac
Change-Id: I161ecd32a392f05dd535496ec119f5252fb77fc9
6 years ago
Android Build Merger (Role)
f88d8ba86a
[automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323
am: d04d54f843
am: 73bc1230e7
am: 70c597fe88
am: 0bfabbf53d
...
Change-Id: Ie57297887fb1bb7c851731592f62089aaee11837
6 years ago
Android Build Merger (Role)
0bfabbf53d
[automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323
am: d04d54f843
am: 73bc1230e7
am: 70c597fe88
...
Change-Id: Iea1a919b03258d7d5653788feddc7e53461a16c9
6 years ago
Android Build Merger (Role)
70c597fe88
[automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323
am: d04d54f843
am: 73bc1230e7
...
Change-Id: I1ea228f53f99030fbf846a694b02e74f56159a94
6 years ago
Android Build Merger (Role)
73bc1230e7
[automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323
am: d04d54f843
...
Change-Id: If7842c0575c4283518e15230d5550356dffe5021
6 years ago
Android Build Merger (Role)
d04d54f843
[automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323
...
Change-Id: I5c235031af2cf5c23bc37a0922a8f8836de28202
6 years ago
akirilov
9bc021a323
MediaExtractor: stop rendering when an error occurs
...
Bug: 68664359
Bug: 110435401
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.StagefrightTest#testStagefright_bug_68664359
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.StagefrightTest#testStagefright_bug_110435401
Change-Id: Icff96fcaa76a5871e7f175b0384d47d5dca7313f
Merged-In: If1322524fcfebc6c5f139288f044b0189da66c1b
6 years ago
Android Build Merger (Role)
77c35f6cac
[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7ba
am: dce12d183a
am: ad0ec9b3af
am: fc7a3a56f9
am: 25e9dff25c
am: e8d5d152bf
am: 1ff39c654a
am: e5d3086f3b
am: 301a0078a8
...
Change-Id: I6983d28e45c047ffb3b7db9a6d02240c5746eec3
6 years ago
Android Build Merger (Role)
301a0078a8
[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7ba
am: dce12d183a
am: ad0ec9b3af
am: fc7a3a56f9
am: 25e9dff25c
am: e8d5d152bf
am: 1ff39c654a
am: e5d3086f3b
...
Change-Id: I7c847f620deb25930874f676b81c09d34d5f5f72
6 years ago
Android Build Merger (Role)
e5d3086f3b
[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7ba
am: dce12d183a
am: ad0ec9b3af
am: fc7a3a56f9
am: 25e9dff25c
am: e8d5d152bf
am: 1ff39c654a
...
Change-Id: I9a6766cd10724fd73e97ac633c835d70b07fdb4d
6 years ago
Android Build Merger (Role)
1ff39c654a
[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7ba
am: dce12d183a
am: ad0ec9b3af
am: fc7a3a56f9
am: 25e9dff25c
am: e8d5d152bf
...
Change-Id: Ibd4d21d5826d9a072b5ab04ece651291c73e98de
6 years ago
Android Build Merger (Role)
e8d5d152bf
[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7ba
am: dce12d183a
am: ad0ec9b3af
am: fc7a3a56f9
am: 25e9dff25c
...
Change-Id: I1152e6a6052862f54489fc48be76bde57120068d
6 years ago
Android Build Merger (Role)
25e9dff25c
[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7ba
am: dce12d183a
am: ad0ec9b3af
am: fc7a3a56f9
...
Change-Id: I9e321e4bd090b976dda07829bec093008ac59966
6 years ago
Android Build Merger (Role)
fc7a3a56f9
[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7ba
am: dce12d183a
am: ad0ec9b3af
...
Change-Id: Ia83dfb602b091c512653eb83d7aa43b1c6e44cf2
6 years ago
Android Build Merger (Role)
ad0ec9b3af
[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7ba
am: dce12d183a
...
Change-Id: I8aa8cb36c18fea386753f1f5160f7b7499358cac
6 years ago
Android Build Merger (Role)
dce12d183a
[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7ba
...
Change-Id: I6b438d3fd0cdbf8d4f85a7e2c053be1c5cbd5e82
6 years ago
Dongwon Kang
fe3708f7ba
Fix a race condition in OMXNodeInstance
...
When it frees the buffers, there might be pending events in
OMX::CallbackDispatcher and these event can be handled after
the component frees the buffers. To prevent the UAF case, this
change invalidates the buffers in the client side first before
calling OMX_FreeBuffer.
Test: run poc with and without the patch
Test: cts-tradefed run cts-dev --module CtsMediaTestCases
--compatibility:module-arg CtsMediaTestCases:include-annotation:
android.platform.test.annotations.RequiresDevice
Bug: 77474014
Change-Id: I0b7c4291967564f697e7f6a5ecbc31d4dae3cbcd
6 years ago
Marco Nelissen
ee82a4b036
Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into oc-dev am: 91abb3dac8
...
am: 767b86ffd7
Change-Id: I72134b3fad1810eb2081e9061be774736fbf9036
6 years ago
Sanjay Singh
c034b4b204
Merge "OMXNodeInstance: Allow dynamic native handle mode for input buffers" into oc-dev am: e41dfae5d5
...
am: e877bf1ba7
Change-Id: I4b69d97ee171ad4ed68fcb76e5b633a2e805b463
6 years ago
Robert Shih
3ab5844df2
[automerger] M3UParser: make url on demand am: 26e236bd42
am: 042483b6ad
am: 9500a5c893
am: 6fac86e8f4
am: cc3897e95b
am: a333901a90
am: b5029cb717
am: e143e026ce
am: 5673ef3ece
am: 29efa36532
...
am: 4e5ada70a5
Change-Id: I96f6f21ae01717188d1714c16ed6996e63d72d1c
6 years ago
Marco Nelissen
767b86ffd7
Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into oc-dev
...
am: 91abb3dac8
Change-Id: I436b0361983489182d5910aab2e81230674ed8c6
6 years ago
Sanjay Singh
e877bf1ba7
Merge "OMXNodeInstance: Allow dynamic native handle mode for input buffers" into oc-dev
...
am: e41dfae5d5
Change-Id: Ib857ac1561aa8cffd22574fb7a8f76869e67b903
6 years ago
Marco Nelissen
91abb3dac8
Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into oc-dev
...
* changes:
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
am: 8aeab2cad9
am: b04ca4cb26
am: 9cae8be448
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
am: 8aeab2cad9
am: b04ca4cb26
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
am: 8aeab2cad9
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
[automerger] Fix possible out of bounds read am: 3762e06152
Fix possible out of bounds read
6 years ago
Marco Nelissen
ac5986c056
Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into nyc-mr2-dev
...
* changes:
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
am: 8aeab2cad9
am: b04ca4cb26
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
am: 8aeab2cad9
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
[automerger] Fix possible out of bounds read am: 3762e06152
Fix possible out of bounds read
6 years ago
Marco Nelissen
5eb714ea02
Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into cw-f-dev
...
* changes:
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
am: 8aeab2cad9
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
[automerger] Fix possible out of bounds read am: 3762e06152
Fix possible out of bounds read
6 years ago
Marco Nelissen
3d634e6472
Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into nyc-mr1-dev
...
* changes:
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
[automerger] Fix possible out of bounds read am: 3762e06152
Fix possible out of bounds read
6 years ago
Marco Nelissen
fe26fc1447
Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into nyc-dr1-dev
...
* changes:
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
[automerger] Fix possible out of bounds read am: 3762e06152
Fix possible out of bounds read
6 years ago
Marco Nelissen
cc5d25bbcd
Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into nyc-dev
...
* changes:
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
[automerger] Fix possible out of bounds read am: 3762e06152
Fix possible out of bounds read
6 years ago
Marco Nelissen
7ad36b07d4
Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into mnc-dr1.5-dev
...
* changes:
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
[automerger] Fix possible out of bounds read am: 3762e06152
Fix possible out of bounds read
6 years ago
Marco Nelissen
1d382c6b79
Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into cw-e-dev
...
* changes:
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
[automerger] Fix possible out of bounds read am: 3762e06152
Fix possible out of bounds read
6 years ago
Marco Nelissen
9c5774045a
Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into mnc-dr-dev
...
* changes:
[automerger] Fix possible out of bounds read am: 3762e06152
Fix possible out of bounds read
6 years ago
Marco Nelissen
ed3f73e92a
Merge "Fix possible out of bounds read" into mnc-dev
6 years ago
Robert Shih
4e5ada70a5
[automerger] M3UParser: make url on demand am: 26e236bd42
am: 042483b6ad
am: 9500a5c893
am: 6fac86e8f4
am: cc3897e95b
am: a333901a90
am: b5029cb717
am: e143e026ce
am: 5673ef3ece
...
am: 29efa36532
Change-Id: I64541739bfbd2ce67a3e464fbd75e078dcb157cc
6 years ago
TreeHugger Robot
e41dfae5d5
Merge "OMXNodeInstance: Allow dynamic native handle mode for input buffers" into oc-dev
6 years ago
Sanjay Singh
bda339098d
OMXNodeInstance: Allow dynamic native handle mode for input buffers
...
Some camera implementation uses Dynamic native handle to send input
buffers to OMX HAL. Therefore, these buffers should be allowed.
Bug: 77486542
Bug: 80174666
Bug: 80210572
Bug: 80252747
Test: sts-tradefed run sts -m StsHostTestCases -t android.security.sts.Poc18_06#testPocBug_77486542
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: adb shell am instrument -e class android.hardware.cts.CameraTest -w 'android.camera.cts/android.support.test.runner.AndroidJUnitRunner'
Test: adb shell am instrument -e class android.hardware.multiprocess.camera.cts.CameraEvictionTest -w 'android.camera.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Exercise secure playback with Play Movies app.
Test: Record video with Camera app and play it back with Photos app
Change-Id: I1e4eb72e070f4e60ff4df94f9b9d161361828477
6 years ago
Android Build Merger (Role)
288c1cf2bf
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
am: 8aeab2cad9
am: b04ca4cb26
am: 9cae8be448
...
Change-Id: Iec58a99cd012bafb4fe1665abfc90337ae0e74c0
6 years ago
Android Build Merger (Role)
9cae8be448
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
am: 8aeab2cad9
am: b04ca4cb26
...
Change-Id: I8e019cb7e9bff94970082b3a3329ff0b33c37135
6 years ago
Android Build Merger (Role)
b04ca4cb26
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
am: 8aeab2cad9
...
Change-Id: I783c7188d71b1f0bd36320a94fcbd9a9e7e39228
6 years ago
Android Build Merger (Role)
8aeab2cad9
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
am: 19d1113bb0
...
Change-Id: Ief894a707f37e18052c5deb54500aa499f69340c
6 years ago
Android Build Merger (Role)
19d1113bb0
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
am: bad0533d2e
...
Change-Id: Ia5a88da9a0fb034270bacc91b2079e56faecc100
6 years ago
Android Build Merger (Role)
bad0533d2e
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
am: 4cdd5c3af5
...
Change-Id: I377cba24b9723397499a1077df22ff018031344f
6 years ago
Android Build Merger (Role)
4cdd5c3af5
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
am: 1c7bb87a42
...
Change-Id: I67887296e09db454c57a3e5026eb7c5d14295084
6 years ago
Android Build Merger (Role)
1c7bb87a42
[automerger] Fix possible out of bounds read am: 3762e06152
am: ecc92a1a86
...
Change-Id: I212c02b69b7d9aa773a8ed1a013a3ff3dd643612
6 years ago
Android Build Merger (Role)
ecc92a1a86
[automerger] Fix possible out of bounds read am: 3762e06152
...
Change-Id: I8bfce5324c52c2203a8f4d3a88ee8c1734114992
6 years ago
Marco Nelissen
3762e06152
Fix possible out of bounds read
...
Bug: 78656554
Test: manual
Change-Id: I677f827483dcc80afac57fd7ef6807e633542252
6 years ago
Android Build Merger (Role)
29efa36532
[automerger] M3UParser: make url on demand am: 26e236bd42
am: 042483b6ad
am: 9500a5c893
am: 6fac86e8f4
am: cc3897e95b
am: a333901a90
am: b5029cb717
am: e143e026ce
am: 5673ef3ece
...
Change-Id: I7c53c7c283690aa24545cd7ee25761df5196d39e
6 years ago
Android Build Merger (Role)
5673ef3ece
[automerger] M3UParser: make url on demand am: 26e236bd42
am: 042483b6ad
am: 9500a5c893
am: 6fac86e8f4
am: cc3897e95b
am: a333901a90
am: b5029cb717
am: e143e026ce
...
Change-Id: Ib2cba2e2129cb89b99c74561ebf823e5ba8e193a
6 years ago
Android Build Merger (Role)
e143e026ce
[automerger] M3UParser: make url on demand am: 26e236bd42
am: 042483b6ad
am: 9500a5c893
am: 6fac86e8f4
am: cc3897e95b
am: a333901a90
am: b5029cb717
...
Change-Id: I36eec35a91583fb5af48d2dc892178dfdbddf4d8
6 years ago
Android Build Merger (Role)
b5029cb717
[automerger] M3UParser: make url on demand am: 26e236bd42
am: 042483b6ad
am: 9500a5c893
am: 6fac86e8f4
am: cc3897e95b
am: a333901a90
...
Change-Id: Ia673c838ea5f9a4519be358bb6ca3af2d6fbc572
6 years ago