summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 6fdc9953f4 -s ours am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseXin Li
4dd58128c0 -s ours am: 4241296c2c -s ours am: 7699eed4d7 -s ours am skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2487024 Change-Id: Ib9ef4e6e51d4a851fabc75f58a460840db50207d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 6fdc9953f4 -s ours am: ↵android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android14-tests-releaseandroid14-tests-devandroid14-devXin Li
4dd58128c0 -s ours am: 4241296c2c -s ours am skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2487024 Change-Id: I13480bb2489b45a0eea0310acac16de05ece2df1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 6fdc9953f4 -s ours am: ↵Xin Li
4dd58128c0 -s ours am skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2487024 Change-Id: I31da8f2036bfabcdbd9ab51443c94d7ee75d466d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 6fdc9953f4 -s oursXin Li
am skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2487024 Change-Id: Ide668513d3769988bd6c8055497ea09352b72851 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge Android 13 QPR2android-u-beta-1-gplXin Li
Bug: 273316506 Merged-In: I03a56f68a7e53d941809560b943153b8fc31decc Change-Id: I220b7e9762876d3e0ff8265fda0083ec1972e400
2023-01-25Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: ↵Kyeongkab.Nam
cee5ba9a09 am: ec8de9b1b2 am: a9e0e072e9 am: 214fbdfb83 am: 67d753fd72 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752 Change-Id: I83f7b0cdff9d3318f844cee1be4db01151b230d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: ↵Kyeongkab.Nam
cee5ba9a09 am: ec8de9b1b2 am: a9e0e072e9 am: 214fbdfb83 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752 Change-Id: I0ec18554ccb4578c681cd0fe2baaea2eca621187 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: ↵Kyeongkab.Nam
cee5ba9a09 am: ec8de9b1b2 am: d9a83c1762 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752 Change-Id: I6f144f072aec60399b795742e806e20e2b3367e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: ↵android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseKyeongkab.Nam
cee5ba9a09 am: ec8de9b1b2 am: a9e0e072e9 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752 Change-Id: Ia6e58222617022ea04daa895522e1e0341b76d14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: ↵Kyeongkab.Nam
cee5ba9a09 am: ec8de9b1b2 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752 Change-Id: I307c3ab7b3e63bedace5980c86dbd01930475191 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: ↵Kyeongkab.Nam
cee5ba9a09 am: ec8de9b1b2 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752 Change-Id: I8d6adb0680e4d5239686b2ebcbf5eb2b2e34305f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: ↵Kyeongkab.Nam
cee5ba9a09 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752 Change-Id: I46634a9110876b62698a121c2f0da60d32db593e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-15Merge "verifyDTBO: update to use bootconfig" am: f8d3af72aa am: 12dc18e4c4 ↵Treehugger Robot
am: 60e32fb1cf Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2388574 Change-Id: I4cd449ec6e65f082c33b68bbd3608205c5a4106d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-15Merge "verifyDTBO: update to use bootconfig" am: f8d3af72aa am: 12dc18e4c4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2388574 Change-Id: Icdcc9b232ea3b5e36a19646e2e2081fdeb89fd0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-15Merge "verifyDTBO: update to use bootconfig" am: f8d3af72aatemp_273316506_tm-qpr2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2388574 Change-Id: I7cab2e229c9cfc83981c5eee8dde7272d8923f73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-15Merge "verifyDTBO: update to use bootconfig"main-16k-with-phonesTreehugger Robot
2023-01-13[automerger skipped] Merge "Merge ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master am: 0a14873b3d -s ours am: b01c76e334 -s ours am skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20956737 Change-Id: I691695dcac203c8ea202e38fe545015a77550ecb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
0dc1efa4ca -s ours am: 6a60424b6b -s ours am skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20956737 Change-Id: I2c4d965fe7cc05e7cb1027488945f9ce5cdad745 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13verifyDTBO: update to use bootconfigWill McVicker
Update verifyDTBO.sh to match the VTS tests FirmwareDtboVerification which first checks the bootconfig for the dtbo_idx. If it doesn't find it, then check the kernel command line. Bug: 265256786 Tested: run ./verifyDTBO.sh on an oriole Change-Id: I50f6f6a22736f8b367bd140cd3e5e0e68dbe6cea
2023-01-13[automerger skipped] Merge "Merge ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master am: 0a14873b3d -s ours am skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20956737 Change-Id: I36d23cbffabe7f8588dce6cbf45f4ab357fe3904 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
0dc1efa4ca -s ours am skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20956737 Change-Id: I10efb8a51324808555667fcd8cf1bef180df7f1a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-masterXin Li
2023-01-13Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: ↵Kyeongkab.Nam
cee5ba9a09 am: 86fd655613 am: 4d2cf52081 am: cf01ad26b7 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752 Change-Id: Ibb7e49974d7fc4fd3b87899e11f9ed70f6301965 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: ↵Kyeongkab.Nam
cee5ba9a09 am: 86fd655613 am: 4d2cf52081 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752 Change-Id: I847a593a231d11659b2b1bf8685b5895615e9d3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: ↵Kyeongkab.Nam
cee5ba9a09 am: 86fd655613 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752 Change-Id: I461a9acb0600237eefc89c18237781b527e9b74a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384 am: ↵Kyeongkab.Nam
cee5ba9a09 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752 Change-Id: I5b611cdeee446045469095839931b759244d4f0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Fix a test to check duplicated phandles am: 718007765a am: bc2c5f2384android13-tests-devKyeongkab.Nam
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752 Change-Id: Id9e3e33501130aba193bcbd7135e7d8b35b158ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Fix a test to check duplicated phandles am: 718007765aandroid12L-tests-devKyeongkab.Nam
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2385752 Change-Id: I909be551c58c7891716a4f53fcb8c2eceef6fd52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136Xin Li
Bug: 264720040 Merged-In: I03a56f68a7e53d941809560b943153b8fc31decc Change-Id: I8a512991e20e7652e9d9bc7338c951d8dd34e2b7
2023-01-12Fix a test to check duplicated phandlesandroid12-tests-devKyeongkab.Nam
All the dtbo will be merged into one fdt to verify if dtb in a test device is the same as expected. However, there are cases the number of phandle will be duplicated Fix a test to get correct phandle_offset. Bug: 259891464 Test: run vts -m VtsFirmwareDtboVerification Change-Id: Ia90a4537a4be0dfbb0316d2b47fb12d619fa7c34 (cherry picked from commit 7bcbff31c5af60933701281d5e682e62732143d8)
2023-01-05Merge "Fix a test to check duplicated phandles" am: c63cf42770 am: ↵Treehugger Robot
ea682bf4a2 am: 13f2d8922e Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2321129 Change-Id: Ie92feca313a3d42582e9ce145905524a40909131 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05Merge "Fix a test to check duplicated phandles" am: c63cf42770 am: ea682bf4a2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2321129 Change-Id: I1b596a84e5c66529028faff8dfa9de2a53316d90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05Merge "Fix a test to check duplicated phandles" am: c63cf42770Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2321129 Change-Id: Ic0d8731f6598cd939329478445223c515e4e25ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05Merge "Fix a test to check duplicated phandles"Treehugger Robot
2023-01-03[automerger skipped] Merge "libufdt: don't overflow when handling propeties ↵Mike McTernan
> INT_MAX in size" into tm-qpr-dev am: b3a49bc3b7 am: b23a6fe0e1 -s ours am skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 4f875b5cc1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20759190 Change-Id: I2f04a354ec92fbd455ddc5fdd719ae297b2806bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03Merge "libufdt: tests: Check input file integrity before parsing." into ↵Mike McTernan
tm-qpr-dev am: d8c0959c92 am: 6bc9ce897b Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20805389 Change-Id: I06fc49a25623820cda758cf7783c0920e379de4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03Merge "libufdt: extract_dtb: Check tree is valid before extraction." into ↵Mike McTernan
tm-qpr-dev am: 393b236d10 am: 567c946742 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20805155 Change-Id: Ie2c18f5545066170d4e296e77ff9adc46779c44c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03Merge "libufdt: don't overflow when handling propeties > INT_MAX in size" ↵Mike McTernan
into tm-qpr-dev am: b3a49bc3b7 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20759190 Change-Id: Id5499c0b895f8f4558e4eb6007887cf0dfe4d0cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03Merge "libufdt: tests: Check input file integrity before parsing." into ↵Mike McTernan
tm-qpr-dev am: d8c0959c92 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20805389 Change-Id: If767e4ad6fa7682611d1171dec1c561a7adf3976 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03Merge "libufdt: extract_dtb: Check tree is valid before extraction." into ↵Mike McTernan
tm-qpr-dev am: 393b236d10 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20805155 Change-Id: I3f82cb046f7d7a5195e6324d89a6c92bd20903be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03Merge "libufdt: don't overflow when handling propeties > INT_MAX in size" ↵Mike McTernan
into tm-qpr-dev
2023-01-03Merge "libufdt: tests: Check input file integrity before parsing." into ↵Mike McTernan
tm-qpr-dev
2023-01-03Merge "libufdt: extract_dtb: Check tree is valid before extraction." into ↵Mike McTernan
tm-qpr-dev
2022-12-23libufdt: don't overflow when handling propeties > INT_MAX in sizeMike McTernan
Ensure property sizes (read as uint32_t) don't overflow the int return value when being read. Fix up _ufdt_output_property_to_fdt() to avoid int overflow if a property len is near INT_MAX in size. Bug: 259062118 Ignore-AOSP-First: Security Test: mmma system/libufdt Test: system/libufdt/tests/run_tests.sh Test: system/libufdt/tests/run_performance_test.sh Change-Id: I03a56f68a7e53d941809560b943153b8fc31decc Merged-In: I03a56f68a7e53d941809560b943153b8fc31decc
2022-12-22[automerger skipped] libufdt: Fix possible null pointer access if test ↵Treehugger Robot
program is fed bad input. am: d68b0549f4 -s ours am: 1a9d855442 -s ours am skip reason: Merged-In I4b9bb58037fc236852529c944d36c4e51e4c43fa with SHA-1 f9100fd2e8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20747473 Change-Id: I2fa0f68374ceaad391fbd8615c140101fb3a081f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22libufdt: tests: Check input file integrity before parsing.Mike McTernan
This prevents malformed input causing the tests to crash, misbehave or fail if there is not enough memory to contain them. Ignore-AOSP-First: Security Bug: 260569699 Test: mma system/libufdt Test: system/libufdt/tests/run_tests.sh Test: system/libufdt/tests/run_performance_test.sh Change-Id: I89df0d33b5f6b5b9484a9b79534ab5163d184e3f (cherry picked from commit 0750fc213182630aa6a4b2156a8beab8a75495c8)
2022-12-22[automerger skipped] libufdt: Fix possible null pointer access if test ↵Treehugger Robot
program is fed bad input. am: d68b0549f4 -s ours am skip reason: Merged-In I4b9bb58037fc236852529c944d36c4e51e4c43fa with SHA-1 f9100fd2e8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20747473 Change-Id: Ie5ab617dd144cd44b07aa5ae9d8010f0e58bed45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22libufdt: Fix possible null pointer access if test program is fed bad input.Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2322015 Bug: 259062118 Change-Id: I2906fadcb930a1e8313667d03518b2db4f9b12bd (cherry picked from commit 2361be57bac9a7fc5671dbcd4cdd0b1e1fda9c9c) Merged-In: I2906fadcb930a1e8313667d03518b2db4f9b12bd Merged-In: I4b9bb58037fc236852529c944d36c4e51e4c43fa Merged-In: I7be1d654b2f8934df58ef03f6a500438ef14dcac Merged-In: I3636732b7a6b2846b05f7de47c23e3246a916dd2
2022-12-22Merge "libufdt: don't overflow when handling propeties > INT_MAX in size"Mike McTernan
2022-12-22libufdt: extract_dtb: Check tree is valid before extraction.Mike McTernan
Ignore-AOSP-First: Security Bug: 261442369 Test: mmma system/libufdt Test: extract_dtb with corrupt tree in image Test: extract_dtb with valid trees in image Test: system/libufdt/tests/run_tests.sh Change-Id: I3d2b29e815323c1d8d3d0d2087ce70d04ab35df4 (cherry picked from commit f2e86523500a4346065e109223dc2c6124188413)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 18:07:51 +0000