aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-08Snap for 10460766 from 63687023fc2e8871a718cb4e18458eece2e3460c to ↵aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030android14-mainline-healthfitness-releaseAndroid Build Coastguard Worker
mainline-healthfitness-release Change-Id: I5fbfbe034221147cb2639055540fab7207d1802b
2023-05-26Snap for 10209341 from eaf1436fc5267127ddd7b08522178f775f7737c2 to ↵Android Build Coastguard Worker
mainline-healthfitness-release Change-Id: I80c82a571fd5be59142403d7281567d6c05085af
2023-03-23Merge changes from topic "ext2simg-fixes" am: 8f3f2f1c57 am: 72aea32529 am: ↵Eric Biggers
34483aac10 am: eaf1436fc5 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2504218 Change-Id: Ia759badec1820c8ae8161cbb6902394eca985d3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Merge changes from topic "ext2simg-fixes" am: 8f3f2f1c57 am: 72aea32529 am: ↵android14-devEric Biggers
34483aac10 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2504218 Change-Id: Ic476844720b9a9746e18739f4a49cf7b78432f05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Merge changes from topic "ext2simg-fixes" am: 8f3f2f1c57 am: 72aea32529Eric Biggers
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2504218 Change-Id: I641eed318f0eca91ee876915ed4f1c103f60df33 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Merge changes from topic "ext2simg-fixes" am: 8f3f2f1c57Eric Biggers
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2504218 Change-Id: I00c5f692b014e73523bc9d2b6c6a05df78f87223 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Merge changes from topic "ext2simg-fixes"android-u-beta-3-gplandroid-u-beta-2-gplandroid-u-beta-1-gplEric Biggers
* changes: ext2simg: fix same_file() with symlinks ext2simg: fix error check of io_channel_read_blk64() ext2simg: clean up integer types and check for too-large fs ext2simg: clean up add_chunk() ext2simg: use a standard flexible array ext2simg: use bool where appropriate ext2simg: fix same_file() to check st_dev ext2simg: fix off-by-one errors causing corruption
2023-03-23Merge "Adding METADATA file to e2fsprogs" am: 70e0f15b84 am: 83e1389aab am: ↵Sadaf Ebrahimi
cb8351e0d1 am: 7edf5512c1 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2506298 Change-Id: I14b29ced04857811e87ab548d91e55fb91ece6dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Merge "Adding METADATA file to e2fsprogs" am: 70e0f15b84 am: 83e1389aab am: ↵Sadaf Ebrahimi
cb8351e0d1 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2506298 Change-Id: Id4204f63e2fadb02908113efb4d9adcd09bbdbd3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Merge "Adding METADATA file to e2fsprogs" am: 70e0f15b84 am: 83e1389aabSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2506298 Change-Id: I145e46bb30f2e529e1b142b53623430405f33415 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Merge "Adding METADATA file to e2fsprogs" am: 70e0f15b84Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2506298 Change-Id: I17250db8fea9dcc67020661b3f6580ea81900f04 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Merge "Adding METADATA file to e2fsprogs"Sadaf Ebrahimi
2023-03-23Adding METADATA file to e2fsprogsSadaf Ebrahimi
Test: TreeHugger Change-Id: Iefd48e3c50ce6d402624e2acaf650c6ef594cd64
2023-03-23ext2simg: fix same_file() with symlinksEric Biggers
Fix same_file() to use stat() instead of lstat() when checking the paths, so that symlinks are dereferenced. This is needed to be consistent with how the paths are actually accessed later. Otherwise, not all cases where the input and output file are the same are detected. Also just use the stat() result to check whether the output file exists, instead of using a separate call to access(). Fixes: db6f320912cf ("AOSP: android: add the ext2simg tool") Change-Id: Ie36981f9dbc19494732f518488a75fb92c0f0343 Signed-off-by: Eric Biggers <ebiggers@google.com>
2023-03-23ext2simg: fix error check of io_channel_read_blk64()Eric Biggers
Check the return value of io_channel_read_blk64() correctly, considering that it returns an errcode_t, which can be positive. Fixes: db6f320912cf ("AOSP: android: add the ext2simg tool") Change-Id: Iafc6c0169bc8ac79198f285da0246ff3b841ded8 Signed-off-by: Eric Biggers <ebiggers@google.com>
2023-03-23ext2simg: clean up integer types and check for too-large fsEric Biggers
libsparse assumes 32-bit block numbers. Also, ext2simg might read nearly the entire filesystem into memory. Therefore, make ext2simg use appropriate integer types, and explicitly check for when the filesystem is too large or allocating memory failed. Change-Id: Ic415d0e974dce2b4ff6e7fa9265f6e86d371a274 Signed-off-by: Eric Biggers <ebiggers@google.com>
2023-03-23ext2simg: clean up add_chunk()Eric Biggers
Remove a level of indentation, check a bool in the normal way, and simplify the linked list handling. No change in behavior. Change-Id: I12589a254f155b1c40418458a666b87c7ef5c1cf Signed-off-by: Eric Biggers <ebiggers@google.com>
2023-03-23ext2simg: use a standard flexible arrayEric Biggers
Use a standard flexible array instead of a nonstandard zero-length array. No change in behavior. Change-Id: Ifdce24f5d6e2471634bb785527def3fe8fefc202 Signed-off-by: Eric Biggers <ebiggers@google.com>
2023-03-23ext2simg: use bool where appropriateEric Biggers
For the values that get used as the 'bool' parameters of sparse_file_write(), use 'bool' in ext2simg too. No change in behavior. Change-Id: I05f7d6fd3027eb10231c035f9fdc8e946e2c4c90 Signed-off-by: Eric Biggers <ebiggers@google.com>
2023-03-23ext2simg: fix same_file() to check st_devEric Biggers
File identity is determined by the combination of st_dev and st_ino, not by st_ino alone. This fixes a bug where ext2simg would needlessly make a copy of all the data when the input and output files happened to have the same st_ino. Fixes: db6f320912cf ("AOSP: android: add the ext2simg tool") Change-Id: I94e4bf57d9f91b31e5438768805e9f10bec3411d Signed-off-by: Eric Biggers <ebiggers@google.com>
2023-03-23ext2simg: fix off-by-one errors causing corruptionEric Biggers
The chunk_end parameter to add_chunk() is exclusive, but two callers incorrectly treat it as inclusive: when the maximum chunk length of 'INT32_MAX - 12' bytes is reached, and when a chunk extends to the very end of the filesystem. The result is that the output simg file contains zeroes for the last block of these chunks instead of the correct data. A related bug is that the expanded size of the simg file is set to the filesystem size (in blocks) minus s_first_data_block. On filesystems where s_first_data_block != 0, i.e. 1K blocksize filesystems without bigalloc enabled, this truncates the last block of the filesystem. Fix these bugs by (a) making add_chunk() take the chunk length and passing the correct values, and (b) using the filesystem size properly. Here is a reproducer that shows the last block of the filesystem being truncated (bsize=1024) and being corrupted with zeroes (bsize=4096): for bsize in 1024 4096; do rm -f ext4.img mkfs.ext4 -b $bsize ext4.img 10000 mkdir -p mnt sudo mount -t ext4 -o loop ext4.img mnt sudo cp /dev/urandom mnt/fill sudo umount mnt ext2simg ext4.img ext4.simg simg2img ext4.simg ext4.img.restored cmp ext4.img ext4.img.restored done Fixes: db6f320912cf ("AOSP: android: add the ext2simg tool") Reported-by: Clemens Lang <clemens.lang@bmw.de> Change-Id: I3b64c4fbffa5821b431f29e99b36168617da7563 Signed-off-by: Eric Biggers <ebiggers@google.com>
2023-03-01Merge "libext2fs: fix ext2fs_get_device_size2() return value on Windows" am: ↵Eric Biggers
4ebb510006 am: 844087a335 am: ed7ad9841a am: 6abe750569 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2461917 Change-Id: I1f50baf262f56c1f3ae433906bb7db8c8549fc7f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Merge "libext2fs: fix ext2fs_get_device_size2() return value on Windows" am: ↵Eric Biggers
4ebb510006 am: 844087a335 am: ed7ad9841a Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2461917 Change-Id: I1a3a150379e2548d1eb65b6f56d46aba5ecce5d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Merge "libext2fs: fix ext2fs_get_device_size2() return value on Windows" am: ↵Eric Biggers
4ebb510006 am: 844087a335 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2461917 Change-Id: Ibe0a22be3c7b229be0d2653cd2aded1d40e87846 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Merge "libext2fs: fix ext2fs_get_device_size2() return value on Windows" am: ↵Eric Biggers
4ebb510006 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2461917 Change-Id: I7a6a570758b27955248306b8bec5f51b31d0454f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Merge "libext2fs: fix ext2fs_get_device_size2() return value on Windows"Eric Biggers
2023-03-01libext2fs: fix ext2fs_get_device_size2() return value on WindowsEric Biggers
Creating a file system on Windows without a pre-existing file stopped working because the Windows version of ext2fs_get_device_size2() doesn't return ENOENT if the file doesn't exist. Fix this. Fixes: 53464654bd33 ("mke2fs: fix creating a file system image w/o a pre-existing file") Bug: 271039230 Change-Id: I2ee1db4cbea85047acac449fa0179e5b7e778ae5 Signed-off-by: Eric Biggers <ebiggers@google.com>
2023-02-09Merge "Mostly restore -Werror for macOS build" am: 8e81aecd53 am: e43a77cd1a ↵Treehugger Robot
am: 122f5e8087 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2427203 Change-Id: If6ff4d503c35aa2ba83f19d35249379c0f7215fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Merge "Mostly restore -Werror for macOS build" am: 8e81aecd53 am: e43a77cd1aTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2427203 Change-Id: I3b1d6909a8bedb188812f5d8b85c48e91761248f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Merge "Mostly restore -Werror for macOS build" am: 8e81aecd53Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2427203 Change-Id: Idd07dfd53e3f5fbad2a31f91d25b6beaf4fbab44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Merge "Mostly restore -Werror for macOS build"Treehugger Robot
2023-02-08Mostly restore -Werror for macOS buildEric Biggers
It turns out the "Can't use getmntent or getmntinfo" warning was the only warning remaining in the macOS build via the Android build system. So now that it's fixed, -Wno-error can be removed. That being said, the upstream CI (GitHub Actions) currently uses -Wno-error=deprecated-declarations for the macOS build, since it's still needed for some files (which aren't built by the Android build system). For now, let's just replace -Wno-error with -Wno-error=deprecated-declarations to match what the upstream CI uses. Change-Id: I77f6649b99432ef1d73a0c7e30bbb150c3111b27
2023-02-07Merge changes Ieacdcbc3,I875001d0,I5a9c9578 am: c1f5cf5960 am: 2f09d25e74 ↵Eric Biggers
am: f48cbf3b8a Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2423954 Change-Id: If07ee64d8b6a8c8668f4c1818239374498f783bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07Merge changes Ieacdcbc3,I875001d0,I5a9c9578 am: c1f5cf5960 am: 2f09d25e74Eric Biggers
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2423954 Change-Id: Idc76c7ae8925247130791092fa5343dde72ea871 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07Merge changes Ieacdcbc3,I875001d0,I5a9c9578 am: c1f5cf5960Eric Biggers
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2423954 Change-Id: I6f6c11365708896933bfad99403c2fe98ee28bda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07Merge changes Ieacdcbc3,I875001d0,I5a9c9578Eric Biggers
* changes: Update OWNERS file Update generated files for Android Merge upstream tag 'v1.46.6' into aosp/master
2023-02-06Update OWNERS fileEric Biggers
- Remove Xoogler salyzyn@ - Add myself Change-Id: Ieacdcbc36fe3fe98f95e06b561b2bd69ad4fabab
2023-02-06Update generated files for AndroidEric Biggers
Change-Id: I875001d0884214e9b61ae5b23d2c7fc8ae1f3eb5
2023-02-06Merge upstream tag 'v1.46.6' into aosp/masterEric Biggers
Upgrade from v1.46.6-rc1+ to v1.46.6. Change-Id: I5a9c95783dd1850dbdd994b2c23a68fdb788df47
2023-02-03Merge changes Iadec9904,I3131563f am: 0ebe3fca69 am: de7e6ec54f am: 3e11664e66Eric Biggers
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2420182 Change-Id: I271355c54b15e25ff249f5febc7b9a09c3ce4d48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03Merge changes Iadec9904,I3131563f am: 0ebe3fca69 am: de7e6ec54fEric Biggers
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2420182 Change-Id: I63f7cc68123dfecb3766113d9ef7d961d524fc2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03Merge changes Iadec9904,I3131563f am: 0ebe3fca69Eric Biggers
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2420182 Change-Id: Ibb74e03a57f5cf4bfc85b6ff1a66e44945be7b5c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03Merge changes Iadec9904,I3131563fEric Biggers
* changes: Update generated files for Android Android: define HAVE_GETMNTINFO on macOS
2023-02-02Update generated files for AndroidEric Biggers
Change-Id: Iadec99046e0d81705054f480fffe7c5e1f7ada6b
2023-02-02Android: define HAVE_GETMNTINFO on macOSEric Biggers
macOS supports getmntinfo(), but not getmntent(). To match what the 'configure' script detects, define HAVE_GETMNTINFO to 1. This prevents the following warning: #warning "Can't use getmntent or getmntinfo to check for mounted filesystems!" Bug: 267448785 Change-Id: I3131563fc317fa9fef7745937ec2c4b09a1d29b0
2023-02-02Merge "Revert "Android: stop suppressing warnings from macOS build"" am: ↵Eric Biggers
70ee9106c2 am: 30bd2524ea am: 2e0c074495 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2419300 Change-Id: Ic87b00ad5511b1056087e0805b035ac557f47c50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02Merge "Revert "Android: stop suppressing warnings from macOS build"" am: ↵Eric Biggers
70ee9106c2 am: 30bd2524ea Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2419300 Change-Id: Iec94dac79be23357a4db8843f899475281ed3e75 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02Merge "Revert "Android: stop suppressing warnings from macOS build"" am: ↵Eric Biggers
70ee9106c2 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2419300 Change-Id: I36b3358ac3275b262e906b8c5aa31100c3abf88f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02Merge "Revert "Android: stop suppressing warnings from macOS build""Eric Biggers
2023-02-02Revert "Android: stop suppressing warnings from macOS build"Eric Biggers
Unfortunately, the macOS build is not tested either by presubmit or by local builds. A macOS build *is* being tested in the upstream GitHub Actions workflow now; however, that uses the autotools-based build system, and there can be issues specific to the Android build system. As a result, removing -Wno-error was not safe yet, and the macOS build is currently broken in postsubmit. As there could be multiple issues, let's restore -Wno-error until I've had a chance to fix the warnings. Bug: 267448785 Change-Id: I305f73d1f8637477da3d57b6c93037a6e3d9e829
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 14:24:13 +0000