~vcs-imports/e2fsprogs/trunk : changes

~vcs-imports/e2fsprogs/trunk » Changes from revision 3720

From Revision 3700 to 3681

Rev	Summary	Authors	Date
3700	e2fsck: do a better job of fixing i_size of inline directori... e2fsck: do a better job of fixing i_size of inline directories If we encounter a directory whose i_size != the inline data size, just set i_size to the size of the inline data. The pb.last_block calculation is wrong since pb.last_block == -1, which results in i_size being set to zero, which corrupts the directory. Clear the inline_data inode flag if we actually /are/ setting i_size to zero. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3699	e2fsck: fix conflicting extents\|inlinedata inode flags e2fsck: fix conflicting extents\|inlinedata inode flags If we come across an inode with the inline data and extents inode flag set, try to figure out the correct flag settings from the contents of i_block and i_size. If i_blocks looks like an extent tree head, we'll make it an extent inode; if it's small enough for inline data, set it to that. This leaves the weird gray area where there's no extent tree but it's too big for the inode -- if /could/ be a block map, change it to that; otherwise, just clear the inode. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3698	e2fsck: clear extents and inline_data flags from fifo/socket... e2fsck: clear extents and inline_data flags from fifo/socket/device inodes Since fifo, socket, and device inodes cannot have inline data or extents, strip off these flags if we find them. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3697	e2fsck: don't try to iterate blocks of an inline_data inode ... e2fsck: don't try to iterate blocks of an inline_data inode when deallocating it Inodes with inline_data set do not have iterable blocks, so don't try to iterate the blocks, because that will just fail, causing e2fsck to abort. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3696	e2fsck: check inline directory data "block" first e2fsck: check inline directory data "block" first Since the inline data flag will cause the extent/block map iteration code to abort fsck early, move the test for the inode flag and the actual block check call further forward in check_blocks. This eliminates an e2fsck abort on an inline data symlink when the file ACL block is set. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3695	e2fsck: handle inline data symlinks e2fsck: handle inline data symlinks Perform some basic checks on inline-data symlinks. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3694	e2fsck: clear inline_data inode flag if EA missing e2fsck: clear inline_data inode flag if EA missing If i_size indicates that an inode requires a system.data extended attribute to hold overflow from i_blocks but the EA cannot be found, offer to truncate the file. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3693	e2fsck: check ea-in-inode regions for overlap e2fsck: check ea-in-inode regions for overlap Ensure that the various blobs in the in-inode EA region do not overlap. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3692	libext2fs: fix memory leak when failing to iterate inline_da... libext2fs: fix memory leak when failing to iterate inline_data directory The xattr_get method returns to us a pointer to a buffer containing the EA value. If for some reason we decide to fail out of iterating the EA part of an inline-data directory, we must free the buffer that xattr_get passed to us (via inline_data_ea_get). Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3691	libext2fs: don't fail inline data operations if there's no E... libext2fs: don't fail inline data operations if there's no EA Fix up the rest of the inline data code not to complain if there's no EA, since it's possible that there's no EA because we're in the process of creating an inline data file. Also, don't return an error code when removing a nonexistent EA, because there's no reason to. Furthermore, if we write less than 60 bytes of inline data, remove the EA to avoid wasting space. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3690	libext2fs: strict inline data overwrite should not return EN... libext2fs: strict inline data overwrite should not return ENOSPC If we're doing a strict overwrite (same data size) of data in an inline data file, we should be able to skip the size check. If the in-core EA representation is fine but the on-disk EA is slightly corrupt (this happens when fixing minor errors in an inline dir), the ext2fs_xattr_inode_max_size() call, which reads the disk EA, can lead us to think that there's no space when in reality there is no issue with doing a strict overwrite. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3689	misc: fix various endianness problems with inline_data misc: fix various endianness problems with inline_data The inline data code fails to perform endianness conversions correctly or at all in a number of places, so fix this so that big-endian machines function properly. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3688	libext2fs/e2fsck: don't run off the end of the EA block libext2fs/e2fsck: don't run off the end of the EA block When we're (a) reading EAs into a buffer; (b) byte-swapping EA entries; or (c) checking EA data, be careful not to run off the end of the memory buffer, because this causes invalid memory accesses and e2fsck crashes. This can happen if we encounter a specially crafted FS image. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3687	libext2fs: check EA value offset libext2fs: check EA value offset Perform a little more sanity checking of EA value offsets so that we don't crash while trying to load things from the filesystem. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3686	e2fsck: convert 'delete files' warning to a proper fix_probl... e2fsck: convert 'delete files' warning to a proper fix_problem error In pass 3, convert the "delete files and re-run e2fsck" message to a proper error code for more consistent error reporting and to make translation easier. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3685	e2fuzz: fix build problems on macosx and i386 linux e2fuzz: fix build problems on macosx and i386 linux Fix clang warnings about forgotten header files, dead code, and pwrite support on OS X. The unistd.h inclusion also fixes a parameter truncation bug on i386. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3684	Merge branch 'maint' into next Merge branch 'maint' into next Conflicts: configure	Theodore Ts'o	9 years ago
3683	.gitignore: Add misc/e2fuzz file .gitignore: Add misc/e2fuzz file This patch adds the misc/e2fuzz tool executable file to .gitignore. Signed-off-by: Artemiy Volkov <artemiyv@acm.org> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Artemiy Volkov	9 years ago
3682	tests: add regression tests for inodes with bad checksums tests: add regression tests for inodes with bad checksums Add regression tests to e2fsck to examine how it deals with inode table blocks which (a) have been zero'd; (b) have been one'd; (c) have corrupt inodes with obvious problems; and (d) have inodes with non-obvious problems. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago
3681	tests: add regression tests for group descriptors with bad c... tests: add regression tests for group descriptors with bad checksums Add tests to examine how e2fsck deals with (a) the block bitmap being corrupt; (b) the inode bitmap being corrupt; (c) the bitmap checksums being incorrect (but the bitmaps are fine); and (d) the group descriptor checksum itself is incorrect. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>	Darrick J. Wong	9 years ago