summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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 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: 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-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-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-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)
2022-12-13Merge "ufdt: mkdtimg: Fix error path stemming from read_fdt_from_image()." ↵Mike McTernan
am: 267a5b5e2b am: d591b83a4a Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2335429 Change-Id: I0dd21e46e7362de42d3999ca41750e1cf73321c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13Merge "ufdt: mkdtimg: Fix error path stemming from read_fdt_from_image()." ↵Mike McTernan
am: 267a5b5e2b Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2335429 Change-Id: I17986c165c16aefe4447d6202101fc331c263da9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13Merge "ufdt: mkdtimg: Fix error path stemming from read_fdt_from_image()."Mike McTernan
2022-12-10Merge "[automerger skipped] Merge Android 13 QPR1 am: 067d292e37 -s ours" ↵Automerger Merge Worker
into stage-aosp-master am: 7d072c5e7f -s ours am skip reason: Merged-In I29e560824aba3b4b53ee4f5c57edaf47cccd3c12 with SHA-1 03f80251bd is already in history Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2338462 Change-Id: Ie7915b6f0f6aee702283b11df23c357cb0cdf70e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 067d292e37 -s ours am: ↵Xin Li
3436aa8d76 -s ours am skip reason: Merged-In I29e560824aba3b4b53ee4f5c57edaf47cccd3c12 with SHA-1 03f80251bd is already in history Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2338462 Change-Id: I5fede4af93ed1c8a9269e9b250d0cbaa6caa196a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 067d292e37 -s ours am: ↵Xin Li
d6ee786559 -s ours am skip reason: Merged-In I29e560824aba3b4b53ee4f5c57edaf47cccd3c12 with SHA-1 03f80251bd is already in history Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2338462 Change-Id: I589d9ad8f52693a007212cdf1b52508f1a936831 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge "[automerger skipped] Merge Android 13 QPR1 am: 067d292e37 -s ours" ↵Automerger Merge Worker
into stage-aosp-master
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 067d292e37 -s oursXin Li
am skip reason: Merged-In I29e560824aba3b4b53ee4f5c57edaf47cccd3c12 with SHA-1 03f80251bd is already in history Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2338462 Change-Id: Iff269386f11e3427692ff1506381d088809ebeb0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 067d292e37 -s oursXin Li
am skip reason: Merged-In I29e560824aba3b4b53ee4f5c57edaf47cccd3c12 with SHA-1 03f80251bd is already in history Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2338462 Change-Id: I05a945a53e563b6463ad028aa6de8fbc5103b7ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge Android 13 QPR1Xin Li
Bug: 261731544 Merged-In: I29e560824aba3b4b53ee4f5c57edaf47cccd3c12 Change-Id: I6257502cd2c3c63227ad7dfc018301e6c740c89d
2022-12-08ufdt: mkdtimg: Fix error path stemming from read_fdt_from_image().Mike McTernan
Check errors from read_fdt_from_image() and don't access NULL pointer if it fails. Bug: 261721707 Test: mm mkdtimg Test: manual; run mkdtimg dump on bad input to verify handling. Test: manual; run tests/mkdtboimg_testdata.sh Change-Id: Ica8c3b2ffcb4df4f24d1c728b6636fd9c5a5fa59
2022-12-05Use unsigned int instead of uint am: 03f80251bd am: 9dab048cc3Colin Cross
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2325553 Change-Id: I5d0ce711fd44b9378813748d867d4d5e4b001bed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05Use unsigned int instead of uint am: 03f80251bdColin Cross
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2325553 Change-Id: I1bbb971b1d6b45c62ef2b40d12b44ce62832f619 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02Use unsigned int instead of uintColin Cross
uint is not a standard type and is not provided by musl libc. Use unsigned int instead. Test: m USE_HOST_MUSL=true libufdt Change-Id: I29e560824aba3b4b53ee4f5c57edaf47cccd3c12
2022-12-02Merge "libufdt: Fix possible null pointer access if test program is fed bad ↵Treehugger Robot
input." am: e55c0823fe am: a4c4d78858 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2322015 Change-Id: I4b9bb58037fc236852529c944d36c4e51e4c43fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02Merge "libufdt: Fix benign signed int overflow in hash calculation." am: ↵Treehugger Robot
59aab34689 am: 0eea1195f4 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2323373 Change-Id: I1eddd80395c929e0a7b7c9ac1d9337501c54e50d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02Merge "libufdt: Fix possible null pointer access if test program is fed bad ↵Treehugger Robot
input." am: e55c0823fe Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2322015 Change-Id: I7be1d654b2f8934df58ef03f6a500438ef14dcac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02Merge "libufdt: Fix benign signed int overflow in hash calculation." am: ↵Treehugger Robot
59aab34689 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2323373 Change-Id: Ie07d256648624815f262db2c69d99d8375149dab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02Merge "libufdt: Fix possible null pointer access if test program is fed bad ↵Treehugger Robot
input."
2022-12-02Merge "libufdt: Fix benign signed int overflow in hash calculation."Treehugger Robot
2022-12-01libufdt: Fix benign signed int overflow in hash calculation.Mike McTernan
Use unsigned int to avoid ubsan warning / errors in hash function. Test: mma libufdt_fuzzer && system/libufdt/tests/run_tests.sh Change-Id: I6d3842dcc6f58220cf1357038df6203fbbe6079e
2022-12-01libufdt: Fix possible null pointer access if test program is fed bad input.Mike McTernan
Test: mma libufdt_fuzzer && system/libufdt/tests/run_tests.sh Change-Id: I20bb070da9192da0795f1bfc7d21d881780429f4
2022-12-01Fix potential memory leaks am: 6282064641 am: d9e99acb37Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2320803 Change-Id: I6c075f6244d8e2c01cc7dbc991cfea52b7f64ea3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01Fix potential memory leaks am: 6282064641Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2320803 Change-Id: I1500a346aba79c1c208c2fbf3876653fce47c532 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30Fix potential memory leaksChih-Hung Hsieh
Bug: 259995529 Test: make tidy-system_subset Change-Id: Id3ea5d9cbe2b2c28634dee85de4e2667291bb1c5
2022-11-30Fix a test to check duplicated phandlesKyeongkab.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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 14:34:39 +0000