linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: "Vladimir 'φ-coder/phcoder' Serbinenko" <phcoder@gmail.com>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH] Fix minixfs size check
Date: Tue, 15 May 2012 00:19:48 +0200	[thread overview]
Message-ID: <20120514221948.GV5353@quack.suse.cz> (raw)
In-Reply-To: <4FAFBBC7.9020101@gmail.com>

On Sun 13-05-12 15:48:55, Vladimir 'φ-coder/phcoder' Serbinenko wrote:
> minixfs file size check is buggy and it doesn't allow creating a block which
> can't be fully filled
  Umm, I'm not really minix expert but who'd set s_max_size to something
which is not a multiple of block size? This looks rather artifical problem
to me...

								Honza
> 
> Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
> 
> diff --git a/fs/minix/itree_v1.c b/fs/minix/itree_v1.c
> index 282e15a..4f8f8b2 100644
> --- a/fs/minix/itree_v1.c
> +++ b/fs/minix/itree_v1.c
> @@ -29,7 +29,8 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])
>  	if (block < 0) {
>  		printk("MINIX-fs: block_to_path: block %ld < 0 on dev %s\n",
>  			block, bdevname(inode->i_sb->s_bdev, b));
> -	} else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) {
> +	} else if ((u64) block * (u64) BLOCK_SIZE
> +		   >= minix_sb(inode->i_sb)->s_max_size) {
>  		if (printk_ratelimit())
>  			printk("MINIX-fs: block_to_path: "
>  			       "block %ld too big on dev %s\n",
> diff --git a/fs/minix/itree_v2.c b/fs/minix/itree_v2.c
> index 13487ad..4a9a19d 100644
> --- a/fs/minix/itree_v2.c
> +++ b/fs/minix/itree_v2.c
> @@ -32,7 +32,8 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH])
>  	if (block < 0) {
>  		printk("MINIX-fs: block_to_path: block %ld < 0 on dev %s\n",
>  			block, bdevname(sb->s_bdev, b));
> -	} else if (block >= (minix_sb(inode->i_sb)->s_max_size/sb->s_blocksize)) {
> +	} else if ((u64) block * (u64) sb->s_blocksize
> +		   >= minix_sb(inode->i_sb)->s_max_size) {
>  		if (printk_ratelimit())
>  			printk("MINIX-fs: block_to_path: "
>  			       "block %ld too big on dev %s\n",
> 


-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR

  reply	other threads:[~2012-05-14 22:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-13 13:48 [PATCH] Fix minixfs size check Vladimir 'φ-coder/phcoder' Serbinenko
2012-05-14 22:19 ` Jan Kara [this message]
2012-05-14 22:33   ` Vladimir 'φ-coder/phcoder' Serbinenko
2012-05-14 23:02     ` Jan Kara
2012-05-14 23:38       ` [PATCH V2] " Vladimir 'φ-coder/phcoder' Serbinenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120514221948.GV5353@quack.suse.cz \
    --to=jack@suse.cz \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=phcoder@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).