Commit Graph

1534 Commits

Author SHA1 Message Date
followmsi b7a57aa2c4 Android 8.1.0 Release 45 (OPM4.171019.021.Z1)
-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW4BXbgAKCRDorT+BmrEO
 eEY4AKCBM0DLJhFwSRwaQ/ajJmBee3jf/ACfS0OtZ9RSrqZ4Mqd0W51AQg+zoo4=
 =+spW
 -----END PGP SIGNATURE-----

Merge tag 'android-8.1.0_r45' into flo-aosp-o

Android 8.1.0 Release 45 (OPM4.171019.021.Z1)
2018-09-07 10:32:42 +02:00
android-build-team Robot 4308f83095 Merge cherrypicks of [4691111, 4689862, 4690575, 4690576, 4690577, 4690578, 4689866, 4689868, 4689869, 4689870, 4691132, 4689456, 4689963, 4691133, 4691134, 4691156, 4691157, 4691159, 4691161, 4690581, 4689964, 4689460, 4691112, 4690582, 4690583, 4691165, 4691166, 4691167, 4691168, 4691169, 4691170, 4691211, 4691212, 4691213, 4691214, 4691215, 4691216, 4691217, 4691218, 4691219, 4691232, 4691233, 4691234, 4691235, 4691236, 4691237, 4691238, 4691239, 4691240, 4691241, 4691243, 4691245, 4691247, 4691249, 4691250, 4691291, 4691292, 4691293, 4691294, 4691295, 4691296, 4691255, 4689476, 4689477, 4689478, 4691223, 4691224, 4691136, 4689479, 4689480, 4691137, 4691225, 4691226, 4691227, 4691371, 4691228, 4691328, 4689967, 4691138, 4691139, 4691140, 4691433, 4689968, 4689969, 4691395, 4691230, 4691297, 4691298, 4691299, 4691300, 4691396, 4691397, 4691398, 4691399, 4691400, 4691401, 4691402, 4691403, 4691404, 4691405, 4691406, 4691407, 4691408, 4691409, 4691410, 4691471, 4691472, 4691473, 4691474, 4691475, 4691476, 4691477, 4691478, 4691479, 4691480, 4691481, 4691482, 4691483, 4691484, 4691485, 4691486, 4691487, 4691488, 4691143, 4691144, 4691511, 4691113, 4689482, 4691533, 4691145, 4691146, 4691147, 4691148, 4691536] into sparse-4732991-L01200000196794104
Change-Id: Id3a4dd1f5a4c6849a70b47ce45bc5eb7a582d621
2018-08-03 19:20:25 +00:00
Ray Essick ea11bb2630 mm-video-v4l2: Protect buffer access and increase input buffer size
Protect buffer access for below scenarios:

*Increase the scope of buf_lock in free_buffer to avoid access
 of freed buffer for both input and output buffers. Also, add check
 before output buffer access.

*Disallow allocate buffer mode after client has called use buffer.

Allocate additional 512 bytes of memory for input buffers on top of
allocation size as per hardware requirement.

Bug: 64340487
Test: ran POC on sailfish/nyc-mr1-dev
Change-Id: Ic13b511b2d1c46e0b158880c41c9a02e2fefd113
Merged-In: Id699404d6c276c8702826d79b3a6ba9755b3439f
(cherry picked from commit 660db9e970)
2018-08-03 19:09:06 +00:00
Ray Essick 34572dcbf4 mm-video-v4l2: Squash below changes
mm-video-v4l2: Protect buffer access and increase input buffer size

Protect buffer access for below scenarios:
*Increase the scope of buf_lock in free_buffer to avoid access
 of freed buffer for both input and output buffers. Also, add check
 before output buffer access.
*Disallow allocate buffer mode after client has called use buffer.
Allocate additional 512 bytes of memory for input buffers on top of
allocation size as per hardware requirement.

mm-video-v4l2: correct the buffer error flag setting

The buffer error flag setting is corrected in free_buffer()
call

Bug: 64340487
Test: poc from bug
Change-Id: I8a28d86135f2fc39a45a6a07355845327dec2dfa
Merged-In: I32d6cb7f61b873edd567881d1bf3e620cd78e715
(cherry picked from commit 808b94b164)
2018-08-03 19:08:56 +00:00
Santhosh Behara 3f70e6c487 mm-video-v4l2: Protect buffer access and increase input buffer size
Protect buffer access for below scenarios:

*Increase the scope of buf_lock in free_buffer to avoid access
 of freed buffer for both input and output buffers. Also, add check
 before output buffer access.

*Disallow allocate buffer mode after client has called use buffer.

Allocate additional 512 bytes of memory for input buffers on top of
allocation size as per hardware requirement.

Bug: 64340487
Test: ran POC on bullhead/nyc-dev
Change-Id: Iabbb2d7e00ff97bfc47b04386feec66976fca99a
(cherry picked from commit 83aeab22d1)
2018-08-03 19:08:46 +00:00
followmsi 91ba1d6230 Android 8.1.0 Release 28 (OPM4.171019.016.B1)
-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWui4FQAKCRDorT+BmrEO
 eP+4AJ4jCYsLcH88wx4X5ctx4jauNErafgCbBxFBuuZ0Xc3daEt434+QPqtWvxg=
 =Jq7g
 -----END PGP SIGNATURE-----

Merge tag 'android-8.1.0_r28' into flo-aosp-o

Android 8.1.0 Release 28 (OPM4.171019.016.B1)
2018-05-08 14:39:00 +02:00
followmsi 6386ba7bb1 Android 8.1.0 release 20
-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWsJ+JwAKCRDorT+BmrEO
 eKAoAJ42T2+C3+3DfO3AQPplYRlyP4pOzwCfW3vxObeN9UROlHtmdt0gWaM2sa8=
 =l2vy
 -----END PGP SIGNATURE-----

Merge tag 'android-8.1.0_r20' into flo-aosp-o

Android 8.1.0 release 20
2018-04-03 12:01:58 +02:00
android-build-team Robot 9ee8696185 Snap for 4657601 from 36b2210b5c to oc-m4-release
Change-Id: Ib9e111eea95389d887f3c9a03503a82d4e0fe1fb
2018-03-21 21:26:33 +00:00
android-build-team Robot 2c28ffd25f Snap for 4565141 from ba8875113b to oc-m4-release
Change-Id: Ie32eaccc2c4f37fff97544b6768778406ac2ad8c
2018-02-26 18:09:40 +00:00
android-build-team Robot 36b2210b5c Snap for 4485699 from ba8875113b to oc-m2-release
Change-Id: Ic3b90233291eedcd89bd9140b40150829bcf8638
2018-01-03 22:39:14 +00:00
followmsi 1ddc623202 Android 8.1.0 Release 6 (OPM1.171019.015)
-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWkwwdQAKCRDorT+BmrEO
 eFg5AJ9dqGH90szrpe5kDOFPgeios6LdmACfbMJDWCVd5O7MhbjijzJeiKeqnW0=
 =iSjc
 -----END PGP SIGNATURE-----

Merge tag 'android-8.1.0_r6' into flo-aosp-o

Android 8.1.0 Release 6 (OPM1.171019.015)
2018-01-03 20:53:01 +01:00
Rashed Abdel-Tawab aef52899f0 media: vdec: Include nativebase headers
Change-Id: I7e6c52617f351b98d9107e54f12d360506c815c6
2017-12-08 00:37:37 +01:00
Deepak Verma 4b7b726b20 mm-video: venc: Correct a typo in variable name
A kernel variable was to be defined as unsigned long but
it is mistakenly defined as unsigned only, the space is
missing after long. This bug is silent because unsigned
is also a valid data type by itself.
Corresponding to kernel fix, similar correction is done
in userspace code.

Change-Id: Ie58f275149dc9c85553f75e02594113b1a03ddcf
CRs-fixed: 556771
2017-12-07 21:04:54 +01:00
android-build-team Robot ba8875113b Merge cherrypicks of [3276508, 3277765, 3277766, 3277904, 3276473, 3278009, 3278010, 3277767, 3277768, 3277769, 3277770, 3276509, 3276510, 3278011, 3278012, 3278013, 3278014, 3278099, 3278100, 3278101, 3278102, 3278103, 3278104, 3278105, 3278106, 3277800, 3276474, 3278015, 3278016, 3278017, 3278118, 3278119, 3278120, 3278121, 3278122, 3277946, 3277905, 3277947, 3277906, 3277751, 3278123, 3277752, 3278110, 3277771, 3277907, 3278095, 3277908, 3278111, 3277772, 3276475, 3276476] into oc-mr1-release
Change-Id: Ied703d922fe5821b2d7a1a70caf33b7776078e53
2017-11-28 03:35:51 +00:00
Santhosh Behara b539e1a4af mm-video-v4l2: venc: Squash below changes
mm-video-v4l2: venc: Protect buffer from being freed while accessing
Change-Id: I6141e81d7dbd50bc3601c8df066fd8cbd06b4e0b

mm-video-v4l2: Protect buffer lifecycle with lock
Change-Id: I0fdb4051c94044e032c257febbe2ba1c7e4d6c7e

mm-video-v4l2: venc: Avoid buffer access after free
Change-Id: Id439aac54ee64a65ea68b6431a9f5150255a6980

mm-video-v4l2: venc: Use client allocated memory if available
Change-Id: I45e4f117e98588ee7c888ec5c1cb2424bc7e5fa3

mm-video-v4l2: Avoid buffer access after free buffer call
Change-Id: Ifde8d4e170b8dbeb9f7485d0222b05c3b2a960f3

Bug:62452543 Bug:36130225 Bug:64750179
CRs-Fixed: 2062772, 2106434, 2106434, 2115779

Test: cts-tradefed run cts -m CtsMediaTestCases and CtsCameraTestCases
Change-Id: Ifde8d4e170b8dbeb9f7485d0222b05c3b2a960f3
(cherry picked from commit b74baf2c2a)
2017-11-28 03:33:02 +00:00
android-build-team Robot 68f02e3cf0 Snap for 4402310 from 74f4a7a12a to oc-m2-release
Change-Id: Idf27da1da23a29cf63bc733f630ab184b6ea1f25
2017-10-18 16:56:03 +00:00
android-build-team Robot 74f4a7a12a Snap for 4393674 from 901d62c2a0 to oc-mr1-release
Change-Id: Ib41542e28b8d2dbc20d70b17c4c1a29e58f2b944
2017-10-13 07:30:30 +00:00
Marco Nelissen 901d62c2a0 Revert "mm-video-v4l2: venc: Protect buffer from being freed while accessing" am: 3a48ecf6f6
am: 69f99cb1d2  -s ours

Change-Id: I2ce02988425af68a7cb55c60dc9ffe07352195b5
2017-10-12 19:54:01 +00:00
Marco Nelissen c0eeea82ed Revert "mm-video-v4l2: venc: Avoid buffer access after free" am: f32a9ed9ee
am: f9bcbfc225  -s ours

Change-Id: Icd8cd34d4e3e0b0593efb9cf1468b604967900aa
2017-10-12 19:53:07 +00:00
Marco Nelissen 69f99cb1d2 Revert "mm-video-v4l2: venc: Protect buffer from being freed while accessing"
am: 3a48ecf6f6

Change-Id: Ibb1641151f8767fce740419c1c27b756ac3e3bd6
2017-10-12 19:51:32 +00:00
Marco Nelissen f9bcbfc225 Revert "mm-video-v4l2: venc: Avoid buffer access after free"
am: f32a9ed9ee

Change-Id: I5f84848960beb11e220d3086fedbdd25b47bcf8f
2017-10-12 19:51:14 +00:00
Marco Nelissen 3a48ecf6f6 Revert "mm-video-v4l2: venc: Protect buffer from being freed while accessing"
This reverts commit 2c15b5832a.

Bug: 36130225
Bug: 67670457

Merged-In: Ibaccd96e730aa3b1d2061c991bb3c8946ba25a95
2017-10-12 18:17:04 +00:00
Marco Nelissen f32a9ed9ee Revert "mm-video-v4l2: venc: Avoid buffer access after free"
This reverts commit cdb855bdd1.
Bug: 36130225
Bug: 67670457

Merged-In: I9f2ba9a9b10fc149d567f19ae8feacf2f1e1df27
2017-10-12 18:16:28 +00:00
android-build-team Robot 89dbc1e109 Snap for 4391495 from b12448b860 to oc-mr1-release
Change-Id: I390ed9755437b016a1c7b2e349fa7bc996e1c4e0
2017-10-12 07:27:25 +00:00
android-build-team Robot 765426b798 Merge cherrypicks of [3054801, 3054802, 3054803, 3055198, 3055199, 3055200] into oc-mr1-release
Change-Id: I83f412e33719f80ca77624838c6abd755f455cba
2017-10-12 04:37:11 +00:00
Eric Laurent c47a7d64ea Revert "mm-video-v4l2: venc: Protect buffer from being freed while accessing"
This reverts commit 2c15b5832a.

Bug: 67670457
Bug: 36130225
Test: capture a video
(cherry picked from commit b12448b860)

Change-Id: I7132d0d5e8f514c8c7377be99fcaa796c0741b9d
2017-10-12 04:36:44 +00:00
Eric Laurent c100cc98e1 Revert "mm-video-v4l2: venc: Avoid buffer access after free"
This reverts commit d53750a9db.

Bug: 67670457
Bug: 36130225
Test: capture a video
(cherry picked from commit 16df6cadae)

Change-Id: I1c288e5398814cbeef302fcf7919e6efd86d2f89
2017-10-12 04:36:36 +00:00
Eric Laurent 870657969b Revert "mm-video-v4l2: venc: Use client allocated memory if available"
This reverts commit 38641613a6.

Bug: 67670457
Bug: 62452543
Test: capture a video
(cherry picked from commit 99560b95dc)

Change-Id: I4b6cc58d582c2aaf72c818008bca2870b02f4c3e
2017-10-12 04:36:28 +00:00
Eric Laurent b12448b860 Revert "mm-video-v4l2: venc: Protect buffer from being freed while accessing"
This reverts commit 2c15b5832a.

Bug: 67670457
Bug: 36130225
Test: capture a video
2017-10-11 15:47:32 -07:00
Eric Laurent 16df6cadae Revert "mm-video-v4l2: venc: Avoid buffer access after free"
This reverts commit d53750a9db.

Bug: 67670457
Bug: 36130225
Test: capture a video
2017-10-11 15:45:03 -07:00
Eric Laurent 99560b95dc Revert "mm-video-v4l2: venc: Use client allocated memory if available"
This reverts commit 38641613a6.

Bug: 67670457
Bug: 62452543
Test: capture a video
2017-10-11 15:43:29 -07:00
android-build-team Robot 16e95ea345 Snap for 4386615 from 45b97094d9 to oc-m2-release
Change-Id: Ia7efbcae59b627624a8320282b5ed2536d0eb19f
2017-10-11 17:29:14 +00:00
android-build-team Robot c2caf728ea Snap for 4388906 from b140d7429a to oc-mr1-release
Change-Id: I32118c838a20b226c4312365c47beda7b7018c3b
2017-10-11 07:26:17 +00:00
Santhosh Behara b140d7429a mm-video-v4l2: venc: Avoid buffer access after free am: b701fb182b am: 6533d3dd97 am: 2d39f9e2b0 am: 9086e5116a am: 2684efbc38 am: 03fdd22ce8
am: 1991311b39

Change-Id: I83b875e37162a3e66dd0fbb1851661b49e304299
2017-10-10 21:55:41 +00:00
Santhosh Behara 6523f2597d mm-video-v4l2: venc: Protect buffer from being freed while accessing am: a569853311 am: 2fcd17bd3a am: 95656fe660 am: fab48ae9b1 am: 238577213a am: f349f65cac
am: 79202f8342

Change-Id: Iec1e4dd02edeaa5ec9e9331ec19b6d3929a7faa1
2017-10-10 21:55:37 +00:00
Santhosh Behara 1991311b39 mm-video-v4l2: venc: Avoid buffer access after free am: b701fb182b am: 6533d3dd97 am: 2d39f9e2b0 am: 9086e5116a am: 2684efbc38
am: 03fdd22ce8

Change-Id: I28381d44a361fdf8748f497082c2da822fb09b7b
2017-10-10 21:53:31 +00:00
Santhosh Behara 79202f8342 mm-video-v4l2: venc: Protect buffer from being freed while accessing am: a569853311 am: 2fcd17bd3a am: 95656fe660 am: fab48ae9b1 am: 238577213a
am: f349f65cac

Change-Id: I7d67a4ddf8730c1350f283be3f4360d3f0ab6fb0
2017-10-10 21:53:09 +00:00
Santhosh Behara 03fdd22ce8 mm-video-v4l2: venc: Avoid buffer access after free am: b701fb182b am: 6533d3dd97 am: 2d39f9e2b0 am: 9086e5116a
am: 2684efbc38

Change-Id: I464c9732003a94b67dddf8f14f293aff6a6aa97a
2017-10-10 21:50:15 +00:00
Santhosh Behara f349f65cac mm-video-v4l2: venc: Protect buffer from being freed while accessing am: a569853311 am: 2fcd17bd3a am: 95656fe660 am: fab48ae9b1
am: 238577213a

Change-Id: I2499518f1a87a1e667b8f2639adb8200e7220cfd
2017-10-10 21:50:10 +00:00
Santhosh Behara 2684efbc38 mm-video-v4l2: venc: Avoid buffer access after free am: b701fb182b am: 6533d3dd97 am: 2d39f9e2b0
am: 9086e5116a

Change-Id: Ib3e4e55e67f23eb88c4fcc8f0f7dfa5d71886976
2017-10-10 21:48:39 +00:00
Santhosh Behara 238577213a mm-video-v4l2: venc: Protect buffer from being freed while accessing am: a569853311 am: 2fcd17bd3a am: 95656fe660
am: fab48ae9b1

Change-Id: Ie92d6a2786b82e7a812cef1524b1daaa9e53e62b
2017-10-10 21:48:37 +00:00
Santhosh Behara 9086e5116a mm-video-v4l2: venc: Avoid buffer access after free am: b701fb182b am: 6533d3dd97
am: 2d39f9e2b0

Change-Id: I1c5e8a49fb9a4b884c94184cb4be1883559e5ed9
2017-10-10 21:46:08 +00:00
Santhosh Behara fab48ae9b1 mm-video-v4l2: venc: Protect buffer from being freed while accessing am: a569853311 am: 2fcd17bd3a
am: 95656fe660

Change-Id: Ifb3a249a6a34141229310beb00baea8f69d9fc13
2017-10-10 21:46:07 +00:00
Santhosh Behara 2d39f9e2b0 mm-video-v4l2: venc: Avoid buffer access after free am: b701fb182b
am: 6533d3dd97

Change-Id: I8702781f14174bf8ef13fdd42c845c249cebca05
2017-10-10 21:44:08 +00:00
Santhosh Behara 95656fe660 mm-video-v4l2: venc: Protect buffer from being freed while accessing am: a569853311
am: 2fcd17bd3a

Change-Id: I06082f4fb4f145c97e6e9a6694f28ff6cba217c5
2017-10-10 21:44:06 +00:00
Santhosh Behara 6533d3dd97 mm-video-v4l2: venc: Avoid buffer access after free
am: b701fb182b

Change-Id: I2a9d917fc507a1e056d6aa743ccdcf11744299cc
2017-10-10 21:42:51 +00:00
Santhosh Behara 2fcd17bd3a mm-video-v4l2: venc: Protect buffer from being freed while accessing
am: a569853311

Change-Id: I773fff29d52e867cb34e5c0f8ef0d83cd25f6e3c
2017-10-10 21:42:35 +00:00
Santhosh Behara f623dbeecd mm-video-v4l2: venc: Avoid buffer access after free am: 2cd0260b52 am: bf218371f6
am: e14e79f8ef  -s ours

Change-Id: I521c5207ff7d40d158e48cc16738c0130025ac85
2017-10-10 20:26:40 +00:00
Santhosh Behara fdbd58329f mm-video-v4l2: venc: Protect buffer from being freed while accessing am: 6ec830ac0c am: c566cb0e26
am: c454469b5f

Change-Id: I66e159cc5b45f60ed2729e20a52efa7f9b228069
2017-10-10 20:26:38 +00:00
Santhosh Behara dbfdf8ba80 mm-video-v4l2: venc: Avoid buffer access after free am: cdb855bdd1
am: 43e5970a5f  -s ours

Change-Id: Ied6d78be95014c066d048bd41d6bb253d3a97501
2017-10-10 19:53:07 +00:00