From: Christoph Hellwig on
> if (fs16_to_cpu(sbi, v7sb->s_nfree) > V7_NICFREE ||
> fs16_to_cpu(sbi, v7sb->s_ninode) > V7_NICINOD ||
> - fs32_to_cpu(sbi, v7sb->s_time) == 0)
> - goto failed;
> + fs32_to_cpu(sbi, v7sb->s_fsize) > V7_MAXSIZE)
> + return 0;

Ok.

> v7i = (struct sysv_inode *)(bh2->b_data + 64);
> if ((fs16_to_cpu(sbi, v7i->i_mode) & ~0777) != S_IFDIR ||
> (fs32_to_cpu(sbi, v7i->i_size) == 0) ||
> - (fs32_to_cpu(sbi, v7i->i_size) & 017) != 0)
> + (fs32_to_cpu(sbi, v7i->i_size) & 017)
> + (fs32_to_cpu(sbi, v7i->i_size) > V7_NFILES *
> + sizeof (struct sysv_dir_entry))) {

Maybe I'm missing something, but without and additional || on the
first line you added this doesn't look like it will compile.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Lubomir Rintel on
On Mon, 2010-07-19 at 16:54 +0200, Christoph Hellwig wrote:

> > v7i = (struct sysv_inode *)(bh2->b_data + 64);
> > if ((fs16_to_cpu(sbi, v7i->i_mode) & ~0777) != S_IFDIR ||
> > (fs32_to_cpu(sbi, v7i->i_size) == 0) ||
> > - (fs32_to_cpu(sbi, v7i->i_size) & 017) != 0)
> > + (fs32_to_cpu(sbi, v7i->i_size) & 017)
> > + (fs32_to_cpu(sbi, v7i->i_size) > V7_NFILES *
> > + sizeof (struct sysv_dir_entry))) {
>
> Maybe I'm missing something, but without and additional || on the
> first line you added this doesn't look like it will compile.

You're right. In fact this hunk is fixed in a commit that followed it, I
probably incorrectly merged the fixups in git (the latter commit also
had an useless comment change and such).

I'll follow up with a fixed commit tomorrow, since I'm unable to test it
now.

Thanks,
Lubo

--
Flash is the Web2.0 version of blink and animated gifs.
-- Stephen Smoogen

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/