linux-ext4 - Re: [PATCH] resize2fs: handle exactly-16T filesystems in resize2fs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LFD.2.00.1012160957320.2781@dhcp-lab-213.englab.brq.redhat.com>
Date:	Thu, 16 Dec 2010 10:00:26 +0100 (CET)
From:	Lukas Czerner <lczerner@...hat.com>
To:	Eric Sandeen <sandeen@...hat.com>
cc:	Theodore Tso <tytso@....edu>,
	ext4 development <linux-ext4@...r.kernel.org>
Subject: Re: [PATCH] resize2fs: handle exactly-16T filesystems in resize2fs

On Wed, 15 Dec 2010, Eric Sandeen wrote:

> Before we go whole-hog on 64-bit e2fsprogs, I wonder if this
> is worth considering as a last-minute addition to the 1.41
> stream.  Currently, mke2fs will shave a block off an exactly-16T
> device to fit*, but resize2fs does not do the same, leading
> to some asymmetry.  This patch fixes that up, and allows 16T
> devices to be handled more gracefully in offline resize.
> (in fact resize2fs will not even open a 16T device, today).
> 
> *commit 37d17a65ecb4615546b417038190a41bafca7c51
> 
> Signed-off-by: Eric Sandeen <sandeen@...hat.com>

Hi Eric,

which version of e2fsprogs are you referring to ? When I look at master
branch I can see than those changes are already in there. Except the check
if the new size is too large. Am I missing something ?

-Lukas

> ---
> 
> Index: e2fsprogs-1.41.12/resize/main.c
> ===================================================================
> --- e2fsprogs-1.41.12.orig/resize/main.c
> +++ e2fsprogs-1.41.12/resize/main.c
> @@ -159,7 +159,7 @@ int main (int argc, char ** argv)
>  	int		print_min_size = 0;
>  	int		fd, ret;
>  	blk_t		new_size = 0;
> -	blk_t		max_size = 0;
> +	blk64_t		max_size = 0;
>  	blk_t		min_size = 0;
>  	io_manager	io_ptr;
>  	char		*new_size_str = 0;
> @@ -375,7 +375,7 @@ int main (int argc, char ** argv)
>  	 * defaults and for making sure the new filesystem doesn't
>  	 * exceed the partition size.
>  	 */
> -	retval = ext2fs_get_device_size(device_name, fs->blocksize,
> +	retval = ext2fs_get_device_size2(device_name, fs->blocksize,
>  					&max_size);
>  	if (retval) {
>  		com_err(program_name, retval,
> @@ -393,6 +393,14 @@ int main (int argc, char ** argv)
>  			exit(1);
>  		}
>  	} else {
> +		/* Take down devices exactly 16T to 2^32-1 blocks */
> +		if (max_size == (1ULL << 32))
> +			max_size--;
> +		else if (max_size > (1ULL << 32)) {
> +			com_err(program_name, 0, _("New size too large to be "
> +				"expressed in 32 bits\n"));
> +			exit(1);
> +		}
>  		new_size = max_size;
>  		/* Round down to an even multiple of a pagesize */
>  		if (sys_page_size > fs->blocksize)
> @@ -432,7 +441,7 @@ int main (int argc, char ** argv)
>  	}
>  	if (!force && (new_size > max_size)) {
>  		fprintf(stderr, _("The containing partition (or device)"
> -			" is only %u (%dk) blocks.\nYou requested a new size"
> +			" is only %llu (%dk) blocks.\nYou requested a new size"
>  			" of %u blocks.\n\n"), max_size,
>  			fs->blocksize / 1024, new_size);
>  		exit(1);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-- 
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html