summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 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-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-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-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-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-11-03libufdt: fix potential reading beyond property value in fixup arraysMike McTernan
Fail if the fixup offset property isn't a list of fdt32_t. Bug: 254929746 Test: mmma system/libufdt && system/libufdt/tests/run_tests.sh Test: mmma system/libufdt && system/libufdt/tests/run_performance_test.sh Test: manual; run with reproducer from fuzzer Test: manual; run with test corpus from fuzzer Change-Id: I8db038ae0f3ac93b800c2c086c6b765dbd14a2ad (cherry picked from commit b9e866a28fb72e13f8f769a7eb9966827bedff89)
2022-09-29Fix potential invalid root node from fdt_to_ufdt_tree() causing OOB access.Mike McTernan
Ignore-AOSP-First: Security Bug: 248085351 Test: mmma system/libufdt && system/libufdt/tests/run_tests.sh Test: mmma system/libufdt && system/libufdt/tests/run_performance_test.sh Test: Run fuzz reproducer. Test: Run fuzzer for 1 hour with 32 jobs. Change-Id: Idf4f87d45d9ce947a2e7508e5e2eb025b279c514 Merged-In: Idf4f87d45d9ce947a2e7508e5e2eb025b279c514 (cherry picked from commit b70383d8af4586a5fa8b16b54c43454bf155c215)
2022-09-26Fix handling of invalid alias property values.Mike McTernan
Bug: 246194233 Test: mmma system/libufdt && system/libufdt/tests/run_tests.sh Test: mmma system/libufdt && system/libufdt/tests/run_performance_test.sh Test: test with fuzzer case Test: run fuzzer to check coverage beyond added checks Ignore-AOSP-First: Security Change-Id: I229cd2ff97a1bea807fdb9d0f4642af5219fc0af (cherry picked from commit 7c57a20a9c74216fece757537f5d4e9115b3a904)
2022-04-19Convert mkdtboimg.py to python 3 am: f20ea93eca am: 9cc2027ccc am: ↵Cole Faust
ca262c4ba6 am: 0734692e4d am: 0206b5ac34 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2061124 Change-Id: Ib89424838fa7acababb828d5f5851b8c47d0acb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Convert mkdtboimg.py to python 3 am: f20ea93eca am: 9cc2027ccc am: ↵Cole Faust
ca262c4ba6 am: 0734692e4d Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2061124 Change-Id: I8da7f0ba8752de953d640a37d61210f0ae6fdb28 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Convert mkdtboimg.py to python 3 am: f20ea93eca am: 9cc2027ccc am: ca262c4ba6t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-vts-13.0_r2android-cts-13.0_r2android13-frc-odp-releaseandroid13-devCole Faust
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2061124 Change-Id: I4e9a155dc46f747ae54d7785e85e8ac83b443d2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Convert mkdtboimg.py to python 3 am: f20ea93eca am: 9cc2027cccCole Faust
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2061124 Change-Id: I7dba59d97696de7d3be892f1ecd8f0835d716211 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Convert mkdtboimg.py to python 3 am: f20ea93ecaCole Faust
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2061124 Change-Id: I2cddc2a5b442d3bd82db9bfaaffe5b8aa8959ced Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Convert mkdtboimg.py to python 3Cole Faust
I was not able to test mkdtboimg_acpi_testdata.sh, because aosp/1391197 appears to have broken mkdtboimg.py when --version 2 is passed (or anything other than 0/1). Bug: 203436762 Test: ./mkdtboimg_testdata.sh Change-Id: I818f9124a3680c7a64935fd406756880e1ddc6c2
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: ad69aee67b -s ours am: 7723962b7f -s ours am skip reason: Merged-In I3b1030635342d607621626a010d57a188c092ed2 with SHA-1 46beef5c6f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/16844194 Change-Id: I09a3449dfb02e653c590da6163e603b0b8ae9eae
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: ad69aee67b -s ours am skip reason: Merged-In I3b1030635342d607621626a010d57a188c092ed2 with SHA-1 46beef5c6f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/16844194 Change-Id: I08ef7aa91ac0e33d420cd4f2fee912b10e663f7c
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I3b1030635342d607621626a010d57a188c092ed2 Change-Id: I6b3d7316dbfbf6c3d94b8ad070bc2c39d357948f
2022-01-25Fix building mkdtimg against musl am: 8b90814391 am: 62f9d011b2 am: ↵Colin Cross
775b233b67 am: 949da29302 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1931938 Change-Id: I84b941b1d4a88d9723f649978504b17376a5150c
2022-01-25Fix building mkdtimg against musl am: 8b90814391 am: 62f9d011b2 am: 775b233b67Colin Cross
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1931938 Change-Id: I1fe92fa6dd427c0eab5415da1f054aa3579fc9c9
2022-01-25Fix building mkdtimg against musl am: 8b90814391 am: 62f9d011b2Colin Cross
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1931938 Change-Id: Iaac626f0d55018eced5af2dced86886cf2da9989
2022-01-25Fix building mkdtimg against musl am: 8b90814391Colin Cross
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1931938 Change-Id: I8f168b63e16e6e2bd68dddc2731a16f1b0fbc9f8
2022-01-07Fix building mkdtimg against muslandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Colin Cross
Fix building mkdtimg against musl libc by fixing a -Wformat error that is not caught by glibc because glibc's fprintf is not annotated with the __printf__ attribute: system/libufdt/utils/src/mkdtimg_dump.c:92:21: error: flag '+' results in undefined behavior with 's' conversion specifier [-Werror,-Wformat] fprintf(out_fp, "%+20s = %d\n", name, fdt32_to_cpu(value)); Bug: 190084016 Test: m USE_HOST_MUSL=true mkdtimg Change-Id: Ibcb5a8839cc3c220789927a7eeffce162fb21613
2022-01-07Remove hridya@ from OWNERS am: 46beef5c6f am: 7413831a75 am: 6950ce173d am: ↵Hridya Valsaraju
2fc7c937ad Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1940144 Change-Id: Ib6a7c47dee80cda274d7f8fc5e032486b4820ed9
2022-01-07Remove hridya@ from OWNERS am: 46beef5c6f am: 7413831a75 am: 6950ce173dHridya Valsaraju
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1940144 Change-Id: If951d5bc849f43bba09776794d7a8808a06deb86
2022-01-07Remove hridya@ from OWNERS am: 46beef5c6f am: 7413831a75Hridya Valsaraju
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1940144 Change-Id: I762605a825ac98b3ece5ed4d57ba826dfff08a90
2022-01-07Remove hridya@ from OWNERS am: 46beef5c6fHridya Valsaraju
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1940144 Change-Id: I3a0d484af2ef72e49a62171a496305636f42d4e1
2022-01-06Remove hridya@ from OWNERSHridya Valsaraju
Test: N/A Bug: N/A Change-Id: I3b1030635342d607621626a010d57a188c092ed2
2021-07-12Change log message to debug VTS DTBO verify issue am: ee1235446a am: ↵gumingtao
b4e4315971 am: b53ee1d949 am: 09b6997b69 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1757318 Change-Id: I8d982ef8ee12a9e5a9d591fc35c1fe6569d63714
2021-07-12Change log message to debug VTS DTBO verify issue am: ee1235446a am: ↵gumingtao
b4e4315971 am: b53ee1d949 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1757318 Change-Id: I79515f042d5301b39ed19753ae461a3edc2999e0
2021-07-12Change log message to debug VTS DTBO verify issue am: ee1235446a am: b4e4315971android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1gumingtao
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1757318 Change-Id: Iccc4cb320995aa90cd9c36571142594b230a17df
2021-07-12Change log message to debug VTS DTBO verify issue am: ee1235446agumingtao
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1757318 Change-Id: I3281a49828f6dff50c7a6112f31a56becbb89548
2021-07-07Change log message to debug VTS DTBO verify issueandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4gumingtao
Patch is intended to debug the DTBO verify issue more conveniently, it is better to replace __overlay__ node with fragment@x node, like this : ufdt_verify_fragment():failed to verify overlay node _overlay_ to target interrupt-controller@0xb220000 instead by: ufdt_verify_fragment():failed to verify fragment node fragment@17 target_node interrupt-controller@0xb220000 Signed-off-by: gumingtao <gumingtao1225@gmail.com> Signed-off-by: gumingtao <gumingtao@xiaomi.com> Change-Id: I3a1616c2ab795f5c962043f44d7e3c6fe85ecb72
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I67c8da6450802de958e0f3d031317763b4daa680
2021-05-17Throw an error on all overlay application errors am: f6b572a2f6 am: ↵Hridya Valsaraju
01856f80fb am: 72cd323bef am: 38fdfacee6 am: c00d54c05b am: b6ce9d0d6b Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1696088 Change-Id: I0d61ab27975cbd24bd888e58a043d43a229ab362
2021-05-16Throw an error on all overlay application errors am: f6b572a2f6 am: ↵Hridya Valsaraju
01856f80fb am: 72cd323bef am: 38fdfacee6 am: c00d54c05b Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1696088 Change-Id: I4164210d457cb514fe777d8321a316e75e98ec3d
2021-05-15Throw an error on all overlay application errors am: f6b572a2f6 am: ↵Hridya Valsaraju
01856f80fb am: 72cd323bef am: 38fdfacee6 am: eb0040a0a0 am: 7e6f2b4a9b Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1696088 Change-Id: If7ec5d9824a071a9490ddc40b1e54cbb17d62099
2021-05-05Throw an error on all overlay application errors am: f6b572a2f6 am: ↵Hridya Valsaraju
01856f80fb am: 72cd323bef am: 38fdfacee6 am: eb0040a0a0 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1696088 Change-Id: Ie369ecdb016c6b44e19e6b2c78956ea026e89e12
2021-05-05Throw an error on all overlay application errors am: f6b572a2f6 am: ↵android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseHridya Valsaraju
01856f80fb am: 72cd323bef am: 38fdfacee6 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1696088 Change-Id: I7df054f6ba8a6a986f4ab49e7298cb7b7b754879
2021-05-05Throw an error on all overlay application errors am: f6b572a2f6 am: ↵Hridya Valsaraju
01856f80fb am: 72cd323bef am: 38fdfacee6 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1696088 Change-Id: Id171d80b06961246ac705de5983652c2bcbb6727
2021-05-05Throw an error on all overlay application errors am: f6b572a2f6 am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseHridya Valsaraju
01856f80fb am: 72cd323bef am: 38fdfacee6 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1696088 Change-Id: Ifea169c5f1fa09f03a2d5cbb31ab3638eee45bc2
2021-05-05Throw an error on all overlay application errors am: f6b572a2f6 am: ↵Hridya Valsaraju
01856f80fb am: 72cd323bef am: 38fdfacee6 Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1696088 Change-Id: If698ca7b4f44d09b8da466a798f2df708400b036
2021-05-05Throw an error on all overlay application errors am: f6b572a2f6 am: ↵android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devHridya Valsaraju
01856f80fb am: 72cd323bef Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1696088 Change-Id: I34aef4dc3d2e4bce82974fa5ede196892be0cff3