On Wed, May 04, 2016 at 03:29:35PM +0200, David Sterba wrote:
> On Mon, May 02, 2016 at 11:15:50AM -0700, Liu Bo wrote:
> > This adds valid checks for super_total_bytes, super_bytes_used and
> > super_stripesize.
> >
> > Reported-by: Vegard Nossum <vegard.nossum@xxxxxxxxxx>
> > Reported-by: Quentin Casasnovas <quentin.casasnovas@xxxxxxxxxx>
> > Signed-off-by: Liu Bo <bo.li.liu@xxxxxxxxxx>
> > ---
> > fs/btrfs/disk-io.c | 14 ++++++++++++++
> > 1 file changed, 14 insertions(+)
> >
> > diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> > index 4e47849..988d03f 100644
> > --- a/fs/btrfs/disk-io.c
> > +++ b/fs/btrfs/disk-io.c
> > @@ -4120,6 +4120,20 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
> > * Hint to catch really bogus numbers, bitflips or so, more exact checks are
> > * done later
> > */
> > + if (btrfs_super_total_bytes(sb) == 0) {
> > + printk(KERN_ERR "BTRFS: total bytes is zero\n");
> > + ret = -EINVAL;
> > + }
> > + if (btrfs_super_bytes_used(sb) < 6 * btrfs_super_nodesize(sb)) {
>
> Similar to total_bytes (sum of device->total_bytes), bytes_used is sum
> of of all device->used_bytes, which in turn is sum of all block group
> sizes on the device.
super_bytes_used has different meanings with device->used_bytes,
device->used_bytes is space that has been allocated to block groups,
super_bytes_used is space that has been consumed by data/metadata.
>
> > + printk(KERN_ERR "BTRFS: bytes_used is too small %llu\n",
> > + btrfs_super_bytes_used(sb));
> > + ret = -EINVAL;
> > + }
> > + if (btrfs_super_stripesize(sb) != 4096) {
>
> This is too strict. The stripesize is unused, but we not force it to be
> 4k, a multiple of nodesize/sectorsize should be enough.
Hmm, in fact stripesize is used in find_free_extent(),
find_free_extent() {
...
search_start = ALIGN(offset, root->stripesize);
...
}
and in open_ctree(),
open_ctree() {
...
stripesize = btrfs_super_stripesize(disk_super);
...
tree_root->stripesize = stripesize;
...
}
btrfs_read_roots() {
...
btrfs_read_tree_root() --> __setup_root(..., tree_root->stripesize, ...)
}
Thus, this stripesize has to be sectorsize at least.
Thanks,
-liubo
>
> > + printk(KERN_ERR "BTRFS: invalid stripesize %u\n",
> > + btrfs_super_stripesize(sb));
> > + ret = -EINVAL;
> > + }
> > if (btrfs_super_num_devices(sb) > (1UL << 31))
> > printk(KERN_WARNING "BTRFS: suspicious number of devices: %llu\n",
> > btrfs_super_num_devices(sb));
> > --
> > 2.5.5
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> > the body of a message to majordomo@xxxxxxxxxxxxxxx
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
