| Message ID | 20170823075759.13982-4-quwenruo.btrfs@gmx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Aug 23, 2017 at 04:57:58PM +0900, Qu Wenruo wrote: > Add extra checker for item with EXTENT_DATA type. > This checks the following thing: > 0) Key offset > All key offset must be aligned to sectorsize. > Inline extent must have 0 for key offset. > > 1) Item size > Plain text inline file extent size must match item size. 'plain text' seems to be a bit misleading, I don't think we've ever referred to uncompressed extent as such, although it makes some sense. I think 'uncompressed' would work too. > (compressed inline file extent has no info about its on-disk size) > Regular/preallocated file extent size must be a fixed value. > > 2) Every member of regular file extent item > Including alignment for bytenr and offset, possible value for > compression/encryption/type. > > 3) Type/compression/encode must be one of the valid values. > > This should be the most comprehensive and restrict check in the context > of btrfs_item for EXTENT_DATA. > > Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> > --- > fs/btrfs/disk-io.c | 108 ++++++++++++++++++++++++++++++++++++++++ > include/uapi/linux/btrfs_tree.h | 1 + > 2 files changed, 109 insertions(+) > > diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c > index e034d08bd036..b92296c6a698 100644 > --- a/fs/btrfs/disk-io.c > +++ b/fs/btrfs/disk-io.c > @@ -549,6 +549,103 @@ static int check_tree_block_fsid(struct btrfs_fs_info *fs_info, > btrfs_header_level(eb) == 0 ? "leaf" : "node", \ > reason, btrfs_header_bytenr(eb), root->objectid, slot) > > +static int check_extent_data_item(struct btrfs_root *root, > + struct extent_buffer *leaf, > + struct btrfs_key *key, int slot) > +{ > + struct btrfs_file_extent_item *fi; > + u32 sectorsize = root->fs_info->sectorsize; > + u32 item_size = btrfs_item_size_nr(leaf, slot); > + > + if (!IS_ALIGNED(key->offset, sectorsize)) { > + CORRUPT("unaligned key offset for file extent", The CORRUPT macro does not print any details beyond what it gets from the parameters, so here we'd like to know which extent it is and what's the size. The sectorsize can be found elsewhere so it does not need to be printed. > + leaf, root, slot); > + return -EUCLEAN; > + } > + > + fi = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item); > + > + if (btrfs_file_extent_type(leaf, fi) >= BTRFS_FILE_EXTENT_LAST_TYPE) { > + CORRUPT("invalid file extent type", leaf, root, slot); "invalid file extent type %d" and actually, we could add some item-specific helpers to report the corruption so if it's for an extent, print the generic extent information, plus an additional information what exactly was wrong. > + return -EUCLEAN; > + } > + > + /* > + * Support for new compression/encrption must introduce incompat flag, > + * and must be caught in open_ctree(). > + */ > + if (btrfs_file_extent_compression(leaf, fi) >= BTRFS_COMPRESS_LAST) { > + CORRUPT("invalid file extent compression", leaf, root, slot); > + return -EUCLEAN; > + } > + if (btrfs_file_extent_encryption(leaf, fi)) { > + CORRUPT("invalid file extent encryption", leaf, root, slot); > + return -EUCLEAN; > + } > + if (btrfs_file_extent_type(leaf, fi) == BTRFS_FILE_EXTENT_INLINE) { > + /* Inline extent must have 0 as key offset */ > + if (key->offset) { > + CORRUPT("inline extent has non-zero key offset", > + leaf, root, slot); > + return -EUCLEAN; > + } > + > + /* Compressed inline extent has no on-disk size, skip it */ > + if (btrfs_file_extent_compression(leaf, fi) != > + BTRFS_COMPRESS_NONE) > + return 0; > + > + /* Plaintext inline extent size must match item size */ > + if (item_size != BTRFS_FILE_EXTENT_INLINE_DATA_START + > + btrfs_file_extent_ram_bytes(leaf, fi)) { > + CORRUPT("plaintext inline extent has invalid size", > + leaf, root, slot); > + return -EUCLEAN; > + } > + return 0; > + } > + > + > + /* regular or preallocated extent has fixed item size */ > + if (item_size != sizeof(*fi)) { > + CORRUPT( > + "regluar or preallocated extent data item size is invalid", > + leaf, root, slot); > + return -EUCLEAN; > + } > + if (!IS_ALIGNED(btrfs_file_extent_ram_bytes(leaf, fi), sectorsize) || Is this condition right? I think I've seen random numbers of ram_bytes in the output of dump-tree so I wonder if this applies only to some extents where the condition holds. > + !IS_ALIGNED(btrfs_file_extent_disk_bytenr(leaf, fi), sectorsize) || > + !IS_ALIGNED(btrfs_file_extent_disk_num_bytes(leaf, fi), > + sectorsize) || > + !IS_ALIGNED(btrfs_file_extent_offset(leaf, fi), sectorsize) || > + !IS_ALIGNED(btrfs_file_extent_num_bytes(leaf, fi), sectorsize)) { > + CORRUPT( > + "regular or preallocated extent data item has unaligned value", > + leaf, root, slot); > + return -EUCLEAN; > + } > + > + return 0; > +} > + > +static int check_leaf_item(struct btrfs_root *root, > + struct extent_buffer *leaf, > + struct btrfs_key *key, int slot) > +{ > + int ret = 0; > + > + /* > + * Considering how overcrowded the code will be inside the switch, > + * complex verification is better to moved its own function. > + */ > + switch (key->type) { > + case BTRFS_EXTENT_DATA_KEY: > + ret = check_extent_data_item(root, leaf, key, slot); > + break; > + } > + return ret; > +} > + > static noinline int check_leaf(struct btrfs_root *root, > struct extent_buffer *leaf) > { > @@ -605,9 +702,13 @@ static noinline int check_leaf(struct btrfs_root *root, > * 1) key order > * 2) item offset and size > * No overlap, no hole, all inside the leaf. > + * 3) item content > + * If possible, do comprehensive sanity check. > + * NOTE: All check must only rely on the item data itself. > */ > for (slot = 0; slot < nritems; slot++) { > u32 item_end_expected; > + int ret; > > btrfs_item_key_to_cpu(leaf, &key, slot); > > @@ -650,6 +751,13 @@ static noinline int check_leaf(struct btrfs_root *root, > return -EUCLEAN; > } > > + /* > + * Check if the item size and content meets other limitation > + */ > + ret = check_leaf_item(root, leaf, &key, slot); > + if (ret < 0) > + return ret; > + > prev_key.objectid = key.objectid; > prev_key.type = key.type; > prev_key.offset = key.offset; > diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h > index 10689e1fdf11..3aadbb74a024 100644 > --- a/include/uapi/linux/btrfs_tree.h > +++ b/include/uapi/linux/btrfs_tree.h > @@ -732,6 +732,7 @@ struct btrfs_balance_item { > #define BTRFS_FILE_EXTENT_INLINE 0 > #define BTRFS_FILE_EXTENT_REG 1 > #define BTRFS_FILE_EXTENT_PREALLOC 2 > +#define BTRFS_FILE_EXTENT_LAST_TYPE 3 This can be confusing as the LAST is one more than the last valid one. And the BTRFS_COMPRESS_LAST got removed already so I don't want to re-introduce it in another way. I'd like to merge the series now, as the error message tuning can come later and we can start testing the sanity checks now. So I'm going to fix only the minor things and then please address the comments that may need more changes like adding the error reporting helpers etc. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2017年09月25日 23:45, David Sterba wrote: > On Wed, Aug 23, 2017 at 04:57:58PM +0900, Qu Wenruo wrote: >> Add extra checker for item with EXTENT_DATA type. >> This checks the following thing: >> 0) Key offset >> All key offset must be aligned to sectorsize. >> Inline extent must have 0 for key offset. >> >> 1) Item size >> Plain text inline file extent size must match item size. > > 'plain text' seems to be a bit misleading, I don't think we've ever > referred to uncompressed extent as such, although it makes some sense. I > think 'uncompressed' would work too. I'll use 'uncompressed' instead. > >> (compressed inline file extent has no info about its on-disk size) >> Regular/preallocated file extent size must be a fixed value. >> >> 2) Every member of regular file extent item >> Including alignment for bytenr and offset, possible value for >> compression/encryption/type. >> >> 3) Type/compression/encode must be one of the valid values. >> >> This should be the most comprehensive and restrict check in the context >> of btrfs_item for EXTENT_DATA. >> >> Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> >> --- >> fs/btrfs/disk-io.c | 108 ++++++++++++++++++++++++++++++++++++++++ >> include/uapi/linux/btrfs_tree.h | 1 + >> 2 files changed, 109 insertions(+) >> >> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c >> index e034d08bd036..b92296c6a698 100644 >> --- a/fs/btrfs/disk-io.c >> +++ b/fs/btrfs/disk-io.c >> @@ -549,6 +549,103 @@ static int check_tree_block_fsid(struct btrfs_fs_info *fs_info, >> btrfs_header_level(eb) == 0 ? "leaf" : "node", \ >> reason, btrfs_header_bytenr(eb), root->objectid, slot) >> >> +static int check_extent_data_item(struct btrfs_root *root, >> + struct extent_buffer *leaf, >> + struct btrfs_key *key, int slot) >> +{ >> + struct btrfs_file_extent_item *fi; >> + u32 sectorsize = root->fs_info->sectorsize; >> + u32 item_size = btrfs_item_size_nr(leaf, slot); >> + >> + if (!IS_ALIGNED(key->offset, sectorsize)) { >> + CORRUPT("unaligned key offset for file extent", > > The CORRUPT macro does not print any details beyond what it gets from > the parameters, so here we'd like to know which extent it is and what's > the size. The sectorsize can be found elsewhere so it does not need > to be printed. Did you mean despite bytenr of the tree block and root objectid, we should output more info about the key? By "size" did you mean the disk_num_bytes of the extent? But since the offset is already invalid, I don't think we can trust any data from that structure, so what we can output is only about the key. I can enhance the output to output the key, but I'm afraid I can't output anything more than that. > >> + leaf, root, slot); >> + return -EUCLEAN; >> + } >> + >> + fi = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item); >> + >> + if (btrfs_file_extent_type(leaf, fi) >= BTRFS_FILE_EXTENT_LAST_TYPE) { >> + CORRUPT("invalid file extent type", leaf, root, slot); > > "invalid file extent type %d" > > and actually, we could add some item-specific helpers to report the > corruption so if it's for an extent, print the generic extent > information, plus an additional information what exactly was wrong. For additional info I'm completely fine. But I'm not sure if it's good to output more info about the item. The biggest problem is, when any member of the item can't pass validation checker, we can't trust the whole item. So the item-specific info may not contain meaningful info. > >> + return -EUCLEAN; >> + } >> + >> + /* >> + * Support for new compression/encrption must introduce incompat flag, >> + * and must be caught in open_ctree(). >> + */ >> + if (btrfs_file_extent_compression(leaf, fi) >= BTRFS_COMPRESS_LAST) { >> + CORRUPT("invalid file extent compression", leaf, root, slot); >> + return -EUCLEAN; >> + } >> + if (btrfs_file_extent_encryption(leaf, fi)) { >> + CORRUPT("invalid file extent encryption", leaf, root, slot); >> + return -EUCLEAN; >> + } >> + if (btrfs_file_extent_type(leaf, fi) == BTRFS_FILE_EXTENT_INLINE) { >> + /* Inline extent must have 0 as key offset */ >> + if (key->offset) { >> + CORRUPT("inline extent has non-zero key offset", >> + leaf, root, slot); >> + return -EUCLEAN; >> + } >> + >> + /* Compressed inline extent has no on-disk size, skip it */ >> + if (btrfs_file_extent_compression(leaf, fi) != >> + BTRFS_COMPRESS_NONE) >> + return 0; >> + >> + /* Plaintext inline extent size must match item size */ >> + if (item_size != BTRFS_FILE_EXTENT_INLINE_DATA_START + >> + btrfs_file_extent_ram_bytes(leaf, fi)) { >> + CORRUPT("plaintext inline extent has invalid size", >> + leaf, root, slot); >> + return -EUCLEAN; >> + } >> + return 0; >> + } >> + >> + >> + /* regular or preallocated extent has fixed item size */ >> + if (item_size != sizeof(*fi)) { >> + CORRUPT( >> + "regluar or preallocated extent data item size is invalid", >> + leaf, root, slot); >> + return -EUCLEAN; >> + } >> + if (!IS_ALIGNED(btrfs_file_extent_ram_bytes(leaf, fi), sectorsize) || > > Is this condition right? I think I've seen random numbers of ram_bytes > in the output of dump-tree so I wonder if this applies only to some > extents where the condition holds. Please note that, this condition is only for regular/prealloc file extent items, so ram_bytes should be sectorsize aligned. (Inlined extent is handled lines before and it will always end with a return) > >> + !IS_ALIGNED(btrfs_file_extent_disk_bytenr(leaf, fi), sectorsize) || >> + !IS_ALIGNED(btrfs_file_extent_disk_num_bytes(leaf, fi), >> + sectorsize) || >> + !IS_ALIGNED(btrfs_file_extent_offset(leaf, fi), sectorsize) || >> + !IS_ALIGNED(btrfs_file_extent_num_bytes(leaf, fi), sectorsize)) { >> + CORRUPT( >> + "regular or preallocated extent data item has unaligned value", >> + leaf, root, slot); >> + return -EUCLEAN; >> + } >> + >> + return 0; >> +} >> + >> +static int check_leaf_item(struct btrfs_root *root, >> + struct extent_buffer *leaf, >> + struct btrfs_key *key, int slot) >> +{ >> + int ret = 0; >> + >> + /* >> + * Considering how overcrowded the code will be inside the switch, >> + * complex verification is better to moved its own function. >> + */ >> + switch (key->type) { >> + case BTRFS_EXTENT_DATA_KEY: >> + ret = check_extent_data_item(root, leaf, key, slot); >> + break; >> + } >> + return ret; >> +} >> + >> static noinline int check_leaf(struct btrfs_root *root, >> struct extent_buffer *leaf) >> { >> @@ -605,9 +702,13 @@ static noinline int check_leaf(struct btrfs_root *root, >> * 1) key order >> * 2) item offset and size >> * No overlap, no hole, all inside the leaf. >> + * 3) item content >> + * If possible, do comprehensive sanity check. >> + * NOTE: All check must only rely on the item data itself. >> */ >> for (slot = 0; slot < nritems; slot++) { >> u32 item_end_expected; >> + int ret; >> >> btrfs_item_key_to_cpu(leaf, &key, slot); >> >> @@ -650,6 +751,13 @@ static noinline int check_leaf(struct btrfs_root *root, >> return -EUCLEAN; >> } >> >> + /* >> + * Check if the item size and content meets other limitation >> + */ >> + ret = check_leaf_item(root, leaf, &key, slot); >> + if (ret < 0) >> + return ret; >> + >> prev_key.objectid = key.objectid; >> prev_key.type = key.type; >> prev_key.offset = key.offset; >> diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h >> index 10689e1fdf11..3aadbb74a024 100644 >> --- a/include/uapi/linux/btrfs_tree.h >> +++ b/include/uapi/linux/btrfs_tree.h >> @@ -732,6 +732,7 @@ struct btrfs_balance_item { >> #define BTRFS_FILE_EXTENT_INLINE 0 >> #define BTRFS_FILE_EXTENT_REG 1 >> #define BTRFS_FILE_EXTENT_PREALLOC 2 >> +#define BTRFS_FILE_EXTENT_LAST_TYPE 3 > > This can be confusing as the LAST is one more than the last valid one. > And the BTRFS_COMPRESS_LAST got removed already so I don't want to > re-introduce it in another way. What about using the same method of btrfs_csum_sizes[]? A new array called btrfs_file_extent_types[] and check the size of it seems good for me. Thanks for the review, Qu > > I'd like to merge the series now, as the error message tuning can come > later and we can start testing the sanity checks now. So I'm going to > fix only the minor things and then please address the comments that may > need more changes like adding the error reporting helpers etc. > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2017年09月26日 08:28, Qu Wenruo wrote: > > > On 2017年09月25日 23:45, David Sterba wrote: >> On Wed, Aug 23, 2017 at 04:57:58PM +0900, Qu Wenruo wrote: >>> Add extra checker for item with EXTENT_DATA type. >>> This checks the following thing: >>> 0) Key offset >>> All key offset must be aligned to sectorsize. >>> Inline extent must have 0 for key offset. >>> >>> 1) Item size >>> Plain text inline file extent size must match item size. >> >> 'plain text' seems to be a bit misleading, I don't think we've ever >> referred to uncompressed extent as such, although it makes some sense. I >> think 'uncompressed' would work too. > > I'll use 'uncompressed' instead. > >> >>> (compressed inline file extent has no info about its on-disk size) >>> Regular/preallocated file extent size must be a fixed value. >>> >>> 2) Every member of regular file extent item >>> Including alignment for bytenr and offset, possible value for >>> compression/encryption/type. >>> >>> 3) Type/compression/encode must be one of the valid values. >>> >>> This should be the most comprehensive and restrict check in the context >>> of btrfs_item for EXTENT_DATA. >>> >>> Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> >>> --- >>> fs/btrfs/disk-io.c | 108 >>> ++++++++++++++++++++++++++++++++++++++++ >>> include/uapi/linux/btrfs_tree.h | 1 + >>> 2 files changed, 109 insertions(+) >>> >>> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c >>> index e034d08bd036..b92296c6a698 100644 >>> --- a/fs/btrfs/disk-io.c >>> +++ b/fs/btrfs/disk-io.c >>> @@ -549,6 +549,103 @@ static int check_tree_block_fsid(struct >>> btrfs_fs_info *fs_info, >>> btrfs_header_level(eb) == 0 ? "leaf" : "node", \ >>> reason, btrfs_header_bytenr(eb), root->objectid, slot) >>> +static int check_extent_data_item(struct btrfs_root *root, >>> + struct extent_buffer *leaf, >>> + struct btrfs_key *key, int slot) >>> +{ >>> + struct btrfs_file_extent_item *fi; >>> + u32 sectorsize = root->fs_info->sectorsize; >>> + u32 item_size = btrfs_item_size_nr(leaf, slot); >>> + >>> + if (!IS_ALIGNED(key->offset, sectorsize)) { >>> + CORRUPT("unaligned key offset for file extent", >> >> The CORRUPT macro does not print any details beyond what it gets from >> the parameters, so here we'd like to know which extent it is and what's >> the size. The sectorsize can be found elsewhere so it does not need >> to be printed. Did you mean, the corrupt can be enhanced just like btrfs_printk() to have custom format and args list? Thanks, Qu > > Did you mean despite bytenr of the tree block and root objectid, we > should output more info about the key? > > By "size" did you mean the disk_num_bytes of the extent? > > But since the offset is already invalid, I don't think we can trust any > data from that structure, so what we can output is only about the key. > > I can enhance the output to output the key, but I'm afraid I can't > output anything more than that. > >> >>> + leaf, root, slot); >>> + return -EUCLEAN; >>> + } >>> + >>> + fi = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item); >>> + >>> + if (btrfs_file_extent_type(leaf, fi) >= >>> BTRFS_FILE_EXTENT_LAST_TYPE) { >>> + CORRUPT("invalid file extent type", leaf, root, slot); >> >> "invalid file extent type %d" >> >> and actually, we could add some item-specific helpers to report the >> corruption so if it's for an extent, print the generic extent >> information, plus an additional information what exactly was wrong. > > For additional info I'm completely fine. > > But I'm not sure if it's good to output more info about the item. > > The biggest problem is, when any member of the item can't pass > validation checker, we can't trust the whole item. > So the item-specific info may not contain meaningful info. > >> >>> + return -EUCLEAN; >>> + } >>> + >>> + /* >>> + * Support for new compression/encrption must introduce incompat >>> flag, >>> + * and must be caught in open_ctree(). >>> + */ >>> + if (btrfs_file_extent_compression(leaf, fi) >= >>> BTRFS_COMPRESS_LAST) { >>> + CORRUPT("invalid file extent compression", leaf, root, slot); >>> + return -EUCLEAN; >>> + } >>> + if (btrfs_file_extent_encryption(leaf, fi)) { >>> + CORRUPT("invalid file extent encryption", leaf, root, slot); >>> + return -EUCLEAN; >>> + } >>> + if (btrfs_file_extent_type(leaf, fi) == BTRFS_FILE_EXTENT_INLINE) { >>> + /* Inline extent must have 0 as key offset */ >>> + if (key->offset) { >>> + CORRUPT("inline extent has non-zero key offset", >>> + leaf, root, slot); >>> + return -EUCLEAN; >>> + } >>> + >>> + /* Compressed inline extent has no on-disk size, skip it */ >>> + if (btrfs_file_extent_compression(leaf, fi) != >>> + BTRFS_COMPRESS_NONE) >>> + return 0; >>> + >>> + /* Plaintext inline extent size must match item size */ >>> + if (item_size != BTRFS_FILE_EXTENT_INLINE_DATA_START + >>> + btrfs_file_extent_ram_bytes(leaf, fi)) { >>> + CORRUPT("plaintext inline extent has invalid size", >>> + leaf, root, slot); >>> + return -EUCLEAN; >>> + } >>> + return 0; >>> + } >>> + >>> + >>> + /* regular or preallocated extent has fixed item size */ >>> + if (item_size != sizeof(*fi)) { >>> + CORRUPT( >>> + "regluar or preallocated extent data item size is invalid", >>> + leaf, root, slot); >>> + return -EUCLEAN; >>> + } >>> + if (!IS_ALIGNED(btrfs_file_extent_ram_bytes(leaf, fi), >>> sectorsize) || >> >> Is this condition right? I think I've seen random numbers of ram_bytes >> in the output of dump-tree so I wonder if this applies only to some >> extents where the condition holds. > > Please note that, this condition is only for regular/prealloc file > extent items, so ram_bytes should be sectorsize aligned. > (Inlined extent is handled lines before and it will always end with a > return) > >> >>> + !IS_ALIGNED(btrfs_file_extent_disk_bytenr(leaf, fi), >>> sectorsize) || >>> + !IS_ALIGNED(btrfs_file_extent_disk_num_bytes(leaf, fi), >>> + sectorsize) || >>> + !IS_ALIGNED(btrfs_file_extent_offset(leaf, fi), sectorsize) || >>> + !IS_ALIGNED(btrfs_file_extent_num_bytes(leaf, fi), >>> sectorsize)) { >>> + CORRUPT( >>> + "regular or preallocated extent data item has unaligned value", >>> + leaf, root, slot); >>> + return -EUCLEAN; >>> + } >>> + >>> + return 0; >>> +} >>> + >>> +static int check_leaf_item(struct btrfs_root *root, >>> + struct extent_buffer *leaf, >>> + struct btrfs_key *key, int slot) >>> +{ >>> + int ret = 0; >>> + >>> + /* >>> + * Considering how overcrowded the code will be inside the switch, >>> + * complex verification is better to moved its own function. >>> + */ >>> + switch (key->type) { >>> + case BTRFS_EXTENT_DATA_KEY: >>> + ret = check_extent_data_item(root, leaf, key, slot); >>> + break; >>> + } >>> + return ret; >>> +} >>> + >>> static noinline int check_leaf(struct btrfs_root *root, >>> struct extent_buffer *leaf) >>> { >>> @@ -605,9 +702,13 @@ static noinline int check_leaf(struct btrfs_root >>> *root, >>> * 1) key order >>> * 2) item offset and size >>> * No overlap, no hole, all inside the leaf. >>> + * 3) item content >>> + * If possible, do comprehensive sanity check. >>> + * NOTE: All check must only rely on the item data itself. >>> */ >>> for (slot = 0; slot < nritems; slot++) { >>> u32 item_end_expected; >>> + int ret; >>> btrfs_item_key_to_cpu(leaf, &key, slot); >>> @@ -650,6 +751,13 @@ static noinline int check_leaf(struct btrfs_root >>> *root, >>> return -EUCLEAN; >>> } >>> + /* >>> + * Check if the item size and content meets other limitation >>> + */ >>> + ret = check_leaf_item(root, leaf, &key, slot); >>> + if (ret < 0) >>> + return ret; >>> + >>> prev_key.objectid = key.objectid; >>> prev_key.type = key.type; >>> prev_key.offset = key.offset; >>> diff --git a/include/uapi/linux/btrfs_tree.h >>> b/include/uapi/linux/btrfs_tree.h >>> index 10689e1fdf11..3aadbb74a024 100644 >>> --- a/include/uapi/linux/btrfs_tree.h >>> +++ b/include/uapi/linux/btrfs_tree.h >>> @@ -732,6 +732,7 @@ struct btrfs_balance_item { >>> #define BTRFS_FILE_EXTENT_INLINE 0 >>> #define BTRFS_FILE_EXTENT_REG 1 >>> #define BTRFS_FILE_EXTENT_PREALLOC 2 >>> +#define BTRFS_FILE_EXTENT_LAST_TYPE 3 >> >> This can be confusing as the LAST is one more than the last valid one. >> And the BTRFS_COMPRESS_LAST got removed already so I don't want to >> re-introduce it in another way. > > What about using the same method of btrfs_csum_sizes[]? > > A new array called btrfs_file_extent_types[] and check the size of it > seems good for me. > > Thanks for the review, > Qu > >> >> I'd like to merge the series now, as the error message tuning can come >> later and we can start testing the sanity checks now. So I'm going to >> fix only the minor things and then please address the comments that may >> need more changes like adding the error reporting helpers etc. >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in >> the body of a message to majordomo@vger.kernel.org >> 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Sep 26, 2017 at 08:28:25AM +0800, Qu Wenruo wrote: > > > On 2017年09月25日 23:45, David Sterba wrote: > > On Wed, Aug 23, 2017 at 04:57:58PM +0900, Qu Wenruo wrote: > >> Add extra checker for item with EXTENT_DATA type. > >> This checks the following thing: > >> 0) Key offset > >> All key offset must be aligned to sectorsize. > >> Inline extent must have 0 for key offset. > >> > >> 1) Item size > >> Plain text inline file extent size must match item size. > > > > 'plain text' seems to be a bit misleading, I don't think we've ever > > referred to uncompressed extent as such, although it makes some sense. I > > think 'uncompressed' would work too. > > I'll use 'uncompressed' instead. I've applied an fixed that in the changelog, as there were some other changes needed due to other patch removing the BTRFS_COMPRESSION_LAST. > >> (compressed inline file extent has no info about its on-disk size) > >> Regular/preallocated file extent size must be a fixed value. > >> > >> 2) Every member of regular file extent item > >> Including alignment for bytenr and offset, possible value for > >> compression/encryption/type. > >> > >> 3) Type/compression/encode must be one of the valid values. > >> > >> This should be the most comprehensive and restrict check in the context > >> of btrfs_item for EXTENT_DATA. > >> > >> Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> > >> --- > >> fs/btrfs/disk-io.c | 108 ++++++++++++++++++++++++++++++++++++++++ > >> include/uapi/linux/btrfs_tree.h | 1 + > >> 2 files changed, 109 insertions(+) > >> > >> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c > >> index e034d08bd036..b92296c6a698 100644 > >> --- a/fs/btrfs/disk-io.c > >> +++ b/fs/btrfs/disk-io.c > >> @@ -549,6 +549,103 @@ static int check_tree_block_fsid(struct btrfs_fs_info *fs_info, > >> btrfs_header_level(eb) == 0 ? "leaf" : "node", \ > >> reason, btrfs_header_bytenr(eb), root->objectid, slot) > >> > >> +static int check_extent_data_item(struct btrfs_root *root, > >> + struct extent_buffer *leaf, > >> + struct btrfs_key *key, int slot) > >> +{ > >> + struct btrfs_file_extent_item *fi; > >> + u32 sectorsize = root->fs_info->sectorsize; > >> + u32 item_size = btrfs_item_size_nr(leaf, slot); > >> + > >> + if (!IS_ALIGNED(key->offset, sectorsize)) { > >> + CORRUPT("unaligned key offset for file extent", > > > > The CORRUPT macro does not print any details beyond what it gets from > > the parameters, so here we'd like to know which extent it is and what's > > the size. The sectorsize can be found elsewhere so it does not need > > to be printed. > > Did you mean despite bytenr of the tree block and root objectid, we > should output more info about the key? Possibly yes, but rather more about the item. If the key objectid/offset are eg. some structural value like the extent offset etc. > By "size" did you mean the disk_num_bytes of the extent? For example, yes. Once the generic checks are ok. > But since the offset is already invalid, I don't think we can trust any > data from that structure, so what we can output is only about the key. > > I can enhance the output to output the key, but I'm afraid I can't > output anything more than that. The idea is to print what seems to be reasonable for futher analyzing the corruption or debugging. Sometimes the raw numbers from error messages can tell if it's a off-by-one or whether it's completely off the scale. Obviously we can dereference only data that have been found valid and the items provide limited number of information, so yes there might be actually almost nothing useful to print. So this depends. Looking at check_extent_data_item, the disk_num_bytes alignment checks cannot be moved before the item type checks, but still the unaligned value can be printed in the message. > > > > >> + leaf, root, slot); > >> + return -EUCLEAN; > >> + } > >> + > >> + fi = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item); > >> + > >> + if (btrfs_file_extent_type(leaf, fi) >= BTRFS_FILE_EXTENT_LAST_TYPE) { > >> + CORRUPT("invalid file extent type", leaf, root, slot); > > > > "invalid file extent type %d" > > > > and actually, we could add some item-specific helpers to report the > > corruption so if it's for an extent, print the generic extent > > information, plus an additional information what exactly was wrong. > > For additional info I'm completely fine. > > But I'm not sure if it's good to output more info about the item. > > The biggest problem is, when any member of the item can't pass > validation checker, we can't trust the whole item. Agreed. > So the item-specific info may not contain meaningful info. I'd not expect more than repeating what was the condition that failed. Something that would help me to match error message with the code and how it could end up there. When I see a message "file item type is wrong" my first question is "so what is the wrong type?". > > > >> + return -EUCLEAN; > >> + } > >> + > >> + /* > >> + * Support for new compression/encrption must introduce incompat flag, > >> + * and must be caught in open_ctree(). > >> + */ > >> + if (btrfs_file_extent_compression(leaf, fi) >= BTRFS_COMPRESS_LAST) { > >> + CORRUPT("invalid file extent compression", leaf, root, slot); > >> + return -EUCLEAN; > >> + } > >> + if (btrfs_file_extent_encryption(leaf, fi)) { > >> + CORRUPT("invalid file extent encryption", leaf, root, slot); > >> + return -EUCLEAN; > >> + } > >> + if (btrfs_file_extent_type(leaf, fi) == BTRFS_FILE_EXTENT_INLINE) { > >> + /* Inline extent must have 0 as key offset */ > >> + if (key->offset) { > >> + CORRUPT("inline extent has non-zero key offset", > >> + leaf, root, slot); > >> + return -EUCLEAN; > >> + } > >> + > >> + /* Compressed inline extent has no on-disk size, skip it */ > >> + if (btrfs_file_extent_compression(leaf, fi) != > >> + BTRFS_COMPRESS_NONE) > >> + return 0; > >> + > >> + /* Plaintext inline extent size must match item size */ > >> + if (item_size != BTRFS_FILE_EXTENT_INLINE_DATA_START + > >> + btrfs_file_extent_ram_bytes(leaf, fi)) { > >> + CORRUPT("plaintext inline extent has invalid size", > >> + leaf, root, slot); > >> + return -EUCLEAN; > >> + } > >> + return 0; > >> + } > >> + > >> + > >> + /* regular or preallocated extent has fixed item size */ > >> + if (item_size != sizeof(*fi)) { > >> + CORRUPT( > >> + "regluar or preallocated extent data item size is invalid", > >> + leaf, root, slot); > >> + return -EUCLEAN; > >> + } > >> + if (!IS_ALIGNED(btrfs_file_extent_ram_bytes(leaf, fi), sectorsize) || > > > > Is this condition right? I think I've seen random numbers of ram_bytes > > in the output of dump-tree so I wonder if this applies only to some > > extents where the condition holds. > > Please note that, this condition is only for regular/prealloc file > extent items, so ram_bytes should be sectorsize aligned. I can't find the tree dump and code confirms that the value should be aligned. > (Inlined extent is handled lines before and it will always end with a > return) > > > > >> + !IS_ALIGNED(btrfs_file_extent_disk_bytenr(leaf, fi), sectorsize) || > >> + !IS_ALIGNED(btrfs_file_extent_disk_num_bytes(leaf, fi), > >> + sectorsize) || > >> + !IS_ALIGNED(btrfs_file_extent_offset(leaf, fi), sectorsize) || > >> + !IS_ALIGNED(btrfs_file_extent_num_bytes(leaf, fi), sectorsize)) { > >> + CORRUPT( > >> + "regular or preallocated extent data item has unaligned value", > >> + leaf, root, slot); > >> + return -EUCLEAN; > >> + } > >> + > >> + return 0; > >> +} > >> + > >> +static int check_leaf_item(struct btrfs_root *root, > >> + struct extent_buffer *leaf, > >> + struct btrfs_key *key, int slot) > >> +{ > >> + int ret = 0; > >> + > >> + /* > >> + * Considering how overcrowded the code will be inside the switch, > >> + * complex verification is better to moved its own function. > >> + */ > >> + switch (key->type) { > >> + case BTRFS_EXTENT_DATA_KEY: > >> + ret = check_extent_data_item(root, leaf, key, slot); > >> + break; > >> + } > >> + return ret; > >> +} > >> + > >> static noinline int check_leaf(struct btrfs_root *root, > >> struct extent_buffer *leaf) > >> { > >> @@ -605,9 +702,13 @@ static noinline int check_leaf(struct btrfs_root *root, > >> * 1) key order > >> * 2) item offset and size > >> * No overlap, no hole, all inside the leaf. > >> + * 3) item content > >> + * If possible, do comprehensive sanity check. > >> + * NOTE: All check must only rely on the item data itself. > >> */ > >> for (slot = 0; slot < nritems; slot++) { > >> u32 item_end_expected; > >> + int ret; > >> > >> btrfs_item_key_to_cpu(leaf, &key, slot); > >> > >> @@ -650,6 +751,13 @@ static noinline int check_leaf(struct btrfs_root *root, > >> return -EUCLEAN; > >> } > >> > >> + /* > >> + * Check if the item size and content meets other limitation > >> + */ > >> + ret = check_leaf_item(root, leaf, &key, slot); > >> + if (ret < 0) > >> + return ret; > >> + > >> prev_key.objectid = key.objectid; > >> prev_key.type = key.type; > >> prev_key.offset = key.offset; > >> diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h > >> index 10689e1fdf11..3aadbb74a024 100644 > >> --- a/include/uapi/linux/btrfs_tree.h > >> +++ b/include/uapi/linux/btrfs_tree.h > >> @@ -732,6 +732,7 @@ struct btrfs_balance_item { > >> #define BTRFS_FILE_EXTENT_INLINE 0 > >> #define BTRFS_FILE_EXTENT_REG 1 > >> #define BTRFS_FILE_EXTENT_PREALLOC 2 > >> +#define BTRFS_FILE_EXTENT_LAST_TYPE 3 > > > > This can be confusing as the LAST is one more than the last valid one. > > And the BTRFS_COMPRESS_LAST got removed already so I don't want to > > re-introduce it in another way. > > What about using the same method of btrfs_csum_sizes[]? > > A new array called btrfs_file_extent_types[] and check the size of it > seems good for me. I'm not sure that the types here follow the same pattern as csum sizes. The item types are part of the format so we won't add new to the list without substantial review, so I think we're fine with the list of defines (or enums eventually). -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Sep 26, 2017 at 08:46:29AM +0800, Qu Wenruo wrote: > On 2017年09月26日 08:28, Qu Wenruo wrote: > > On 2017年09月25日 23:45, David Sterba wrote: > >> On Wed, Aug 23, 2017 at 04:57:58PM +0900, Qu Wenruo wrote: > >>> Add extra checker for item with EXTENT_DATA type. > >>> This checks the following thing: > >>> 0) Key offset > >>> All key offset must be aligned to sectorsize. > >>> Inline extent must have 0 for key offset. > >>> > >>> 1) Item size > >>> Plain text inline file extent size must match item size. > >> > >> 'plain text' seems to be a bit misleading, I don't think we've ever > >> referred to uncompressed extent as such, although it makes some sense. I > >> think 'uncompressed' would work too. > > > > I'll use 'uncompressed' instead. > > > >> > >>> (compressed inline file extent has no info about its on-disk size) > >>> Regular/preallocated file extent size must be a fixed value. > >>> > >>> 2) Every member of regular file extent item > >>> Including alignment for bytenr and offset, possible value for > >>> compression/encryption/type. > >>> > >>> 3) Type/compression/encode must be one of the valid values. > >>> > >>> This should be the most comprehensive and restrict check in the context > >>> of btrfs_item for EXTENT_DATA. > >>> > >>> Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> > >>> --- > >>> fs/btrfs/disk-io.c | 108 > >>> ++++++++++++++++++++++++++++++++++++++++ > >>> include/uapi/linux/btrfs_tree.h | 1 + > >>> 2 files changed, 109 insertions(+) > >>> > >>> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c > >>> index e034d08bd036..b92296c6a698 100644 > >>> --- a/fs/btrfs/disk-io.c > >>> +++ b/fs/btrfs/disk-io.c > >>> @@ -549,6 +549,103 @@ static int check_tree_block_fsid(struct > >>> btrfs_fs_info *fs_info, > >>> btrfs_header_level(eb) == 0 ? "leaf" : "node", \ > >>> reason, btrfs_header_bytenr(eb), root->objectid, slot) > >>> +static int check_extent_data_item(struct btrfs_root *root, > >>> + struct extent_buffer *leaf, > >>> + struct btrfs_key *key, int slot) > >>> +{ > >>> + struct btrfs_file_extent_item *fi; > >>> + u32 sectorsize = root->fs_info->sectorsize; > >>> + u32 item_size = btrfs_item_size_nr(leaf, slot); > >>> + > >>> + if (!IS_ALIGNED(key->offset, sectorsize)) { > >>> + CORRUPT("unaligned key offset for file extent", > >> > >> The CORRUPT macro does not print any details beyond what it gets from > >> the parameters, so here we'd like to know which extent it is and what's > >> the size. The sectorsize can be found elsewhere so it does not need > >> to be printed. > > Did you mean, the corrupt can be enhanced just like btrfs_printk() to > have custom format and args list? Yeah something like that. And also make it a function, unless we're going to use some macro magic (I'm not sure about that yet). Schematically: btrfs_report_corruption(fs_info, EXTENT_ITEM, "file item type is unknown: %d", fi->type); implemented as: btrfs_err(fs_info, "corruption detected for item %d: " "file item type is unknown: %d", EXTENT_ITEM fi->type); Here comes the magic: as btrfs_err will print the arguments on one line and adds the \n, we have to merge the string and the argument list into one. But if adding a separate helper similar to btrfs_err would be more suitable, then ok. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2017年09月26日 20:05, David Sterba wrote: > On Tue, Sep 26, 2017 at 08:28:25AM +0800, Qu Wenruo wrote: >> >> >> On 2017年09月25日 23:45, David Sterba wrote: >>> On Wed, Aug 23, 2017 at 04:57:58PM +0900, Qu Wenruo wrote: >>>> Add extra checker for item with EXTENT_DATA type. >>>> This checks the following thing: >>>> 0) Key offset >>>> All key offset must be aligned to sectorsize. >>>> Inline extent must have 0 for key offset. >>>> >>>> 1) Item size >>>> Plain text inline file extent size must match item size. >>> >>> 'plain text' seems to be a bit misleading, I don't think we've ever >>> referred to uncompressed extent as such, although it makes some sense. I >>> think 'uncompressed' would work too. >> >> I'll use 'uncompressed' instead. > > I've applied an fixed that in the changelog, as there were some other > changes needed due to other patch removing the BTRFS_COMPRESSION_LAST. Checked the commit 0826e7faa895f5463e4790082392cdaaff98d8d8, which uses BTRFS_FILE_EXTENT_TYPES and doesn't increase but using the last value. Looks very good to me. > >>>> (compressed inline file extent has no info about its on-disk size) >>>> Regular/preallocated file extent size must be a fixed value. >>>> >>>> 2) Every member of regular file extent item >>>> Including alignment for bytenr and offset, possible value for >>>> compression/encryption/type. >>>> >>>> 3) Type/compression/encode must be one of the valid values. >>>> >>>> This should be the most comprehensive and restrict check in the context >>>> of btrfs_item for EXTENT_DATA. >>>> >>>> Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> >>>> --- >>>> fs/btrfs/disk-io.c | 108 ++++++++++++++++++++++++++++++++++++++++ >>>> include/uapi/linux/btrfs_tree.h | 1 + >>>> 2 files changed, 109 insertions(+) >>>> >>>> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c >>>> index e034d08bd036..b92296c6a698 100644 >>>> --- a/fs/btrfs/disk-io.c >>>> +++ b/fs/btrfs/disk-io.c >>>> @@ -549,6 +549,103 @@ static int check_tree_block_fsid(struct btrfs_fs_info *fs_info, >>>> btrfs_header_level(eb) == 0 ? "leaf" : "node", \ >>>> reason, btrfs_header_bytenr(eb), root->objectid, slot) >>>> >>>> +static int check_extent_data_item(struct btrfs_root *root, >>>> + struct extent_buffer *leaf, >>>> + struct btrfs_key *key, int slot) >>>> +{ >>>> + struct btrfs_file_extent_item *fi; >>>> + u32 sectorsize = root->fs_info->sectorsize; >>>> + u32 item_size = btrfs_item_size_nr(leaf, slot); >>>> + >>>> + if (!IS_ALIGNED(key->offset, sectorsize)) { >>>> + CORRUPT("unaligned key offset for file extent", >>> >>> The CORRUPT macro does not print any details beyond what it gets from >>> the parameters, so here we'd like to know which extent it is and what's >>> the size. The sectorsize can be found elsewhere so it does not need >>> to be printed. >> >> Did you mean despite bytenr of the tree block and root objectid, we >> should output more info about the key? > > Possibly yes, but rather more about the item. If the key objectid/offset > are eg. some structural value like the extent offset etc. Understood. So in short, the reporter should do: 1) Report the wrong value 2) Report expected value (or value range) 3) Using meaningful name other than key values 4) Report extra meaningful values if they passed their checker 5) Checker order must follow member order And following above principle, using wrong file_extent_type as example, it should report like: --- root=512 ino=768 file_offset=4096 invalid file_extent_type, have 0x4, expected range [0, 2] --- What about this principle? (Although I think it's a little long, especially when extra fs_uuid appended) <snip> >> >> Please note that, this condition is only for regular/prealloc file >> extent items, so ram_bytes should be sectorsize aligned. > > I can't find the tree dump and code confirms that the value should be > aligned. Strange. I just did a 6K write with compression, it produced such dump-tree result: --- item 4 key (257 INODE_ITEM 0) itemoff 15881 itemsize 160 generation 7 transid 7 size 6144 nbytes 8192 <<< block group 0 mode 100600 links 1 uid 0 gid 0 rdev 0 sequence 0 flags 0x2(none) <snip> item 5 key (257 INODE_REF 256) itemoff 15866 itemsize 15 index 2 namelen 5 name: file1 item 6 key (257 EXTENT_DATA 0) itemoff 15813 itemsize 53 generation 7 type 1 (regular) extent data disk byte 12845056 nr 4096 <<< extent data offset 0 nr 8192 ram 8192 <<< extent compression 1 (zlib) --- Since the compression is all page based, I didn't think the ram_bytes can be page unaligned. Anyway, I can remove the ram_bytes check until we get a better understanding of its definition. (And better record it in wiki for later developers) All these checker must be fully reviewed and get agreement from all reviewers. Or it will cause tons of error report from end users. So I'm pretty OK to delay the merge 1 or 2 cycles. And if above error report principles are OK for you, I think I'll need to create new report mechanisms for these patches. And all of these patches may get a big update. (Of course, I'll use function other than macro unless I need stringification) So I'm afraid you may need to re-apply all of them then. Sorry for the inconvience in advance. Thanks, Qu -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2017年09月26日 20:13, David Sterba wrote: > On Tue, Sep 26, 2017 at 08:46:29AM +0800, Qu Wenruo wrote: >> On 2017年09月26日 08:28, Qu Wenruo wrote: >>> On 2017年09月25日 23:45, David Sterba wrote: >>>> On Wed, Aug 23, 2017 at 04:57:58PM +0900, Qu Wenruo wrote: >>>>> Add extra checker for item with EXTENT_DATA type. >>>>> This checks the following thing: >>>>> 0) Key offset >>>>> All key offset must be aligned to sectorsize. >>>>> Inline extent must have 0 for key offset. >>>>> >>>>> 1) Item size >>>>> Plain text inline file extent size must match item size. >>>> >>>> 'plain text' seems to be a bit misleading, I don't think we've ever >>>> referred to uncompressed extent as such, although it makes some sense. I >>>> think 'uncompressed' would work too. >>> >>> I'll use 'uncompressed' instead. >>> >>>> >>>>> (compressed inline file extent has no info about its on-disk size) >>>>> Regular/preallocated file extent size must be a fixed value. >>>>> >>>>> 2) Every member of regular file extent item >>>>> Including alignment for bytenr and offset, possible value for >>>>> compression/encryption/type. >>>>> >>>>> 3) Type/compression/encode must be one of the valid values. >>>>> >>>>> This should be the most comprehensive and restrict check in the context >>>>> of btrfs_item for EXTENT_DATA. >>>>> >>>>> Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> >>>>> --- >>>>> fs/btrfs/disk-io.c | 108 >>>>> ++++++++++++++++++++++++++++++++++++++++ >>>>> include/uapi/linux/btrfs_tree.h | 1 + >>>>> 2 files changed, 109 insertions(+) >>>>> >>>>> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c >>>>> index e034d08bd036..b92296c6a698 100644 >>>>> --- a/fs/btrfs/disk-io.c >>>>> +++ b/fs/btrfs/disk-io.c >>>>> @@ -549,6 +549,103 @@ static int check_tree_block_fsid(struct >>>>> btrfs_fs_info *fs_info, >>>>> btrfs_header_level(eb) == 0 ? "leaf" : "node", \ >>>>> reason, btrfs_header_bytenr(eb), root->objectid, slot) >>>>> +static int check_extent_data_item(struct btrfs_root *root, >>>>> + struct extent_buffer *leaf, >>>>> + struct btrfs_key *key, int slot) >>>>> +{ >>>>> + struct btrfs_file_extent_item *fi; >>>>> + u32 sectorsize = root->fs_info->sectorsize; >>>>> + u32 item_size = btrfs_item_size_nr(leaf, slot); >>>>> + >>>>> + if (!IS_ALIGNED(key->offset, sectorsize)) { >>>>> + CORRUPT("unaligned key offset for file extent", >>>> >>>> The CORRUPT macro does not print any details beyond what it gets from >>>> the parameters, so here we'd like to know which extent it is and what's >>>> the size. The sectorsize can be found elsewhere so it does not need >>>> to be printed. >> >> Did you mean, the corrupt can be enhanced just like btrfs_printk() to >> have custom format and args list? > > Yeah something like that. And also make it a function, unless we're > going to use some macro magic (I'm not sure about that yet). > > Schematically: > > btrfs_report_corruption(fs_info, EXTENT_ITEM, "file item type is unknown: %d", fi->type); > > implemented as: > > btrfs_err(fs_info, > "corruption detected for item %d: " > "file item type is unknown: %d", > EXTENT_ITEM > fi->type); > > Here comes the magic: as btrfs_err will print the arguments on one line > and adds the \n, we have to merge the string and the argument list into > one. > > But if adding a separate helper similar to btrfs_err would be more > suitable, then ok. > I'll try to implement it, but I'm a little afraid that it may turn out to little common routine for the error report and we may need to manually craft the output for each member. But I'll keep this point in mind when updating the patchset. BTW, what about moving these checkers and error reporting mechanism to its own C file? The code will definitely get larger and larger, I think moving them to one separate file at the very beginning will save us more time. Thanks, Qu -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Sep 26, 2017 at 08:49:55PM +0800, Qu Wenruo wrote: > > Yeah something like that. And also make it a function, unless we're > > going to use some macro magic (I'm not sure about that yet). > > > > Schematically: > > > > btrfs_report_corruption(fs_info, EXTENT_ITEM, "file item type is unknown: %d", fi->type); > > > > implemented as: > > > > btrfs_err(fs_info, > > "corruption detected for item %d: " > > "file item type is unknown: %d", > > EXTENT_ITEM > > fi->type); > > > > Here comes the magic: as btrfs_err will print the arguments on one line > > and adds the \n, we have to merge the string and the argument list into > > one. > > > > But if adding a separate helper similar to btrfs_err would be more > > suitable, then ok. > > > I'll try to implement it, but I'm a little afraid that it may turn out > to little common routine for the error report and we may need to > manually craft the output for each member. > > But I'll keep this point in mind when updating the patchset. Ok, let's see how far we can make it. Please send only updates on top of this patches for now, I've merged them to misc-next (ie. "for 4.15"). > BTW, what about moving these checkers and error reporting mechanism to > its own C file? > The code will definitely get larger and larger, I think moving them to > one separate file at the very beginning will save us more time. Good point, please proceed. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index e034d08bd036..b92296c6a698 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -549,6 +549,103 @@ static int check_tree_block_fsid(struct btrfs_fs_info *fs_info, btrfs_header_level(eb) == 0 ? "leaf" : "node", \ reason, btrfs_header_bytenr(eb), root->objectid, slot) +static int check_extent_data_item(struct btrfs_root *root, + struct extent_buffer *leaf, + struct btrfs_key *key, int slot) +{ + struct btrfs_file_extent_item *fi; + u32 sectorsize = root->fs_info->sectorsize; + u32 item_size = btrfs_item_size_nr(leaf, slot); + + if (!IS_ALIGNED(key->offset, sectorsize)) { + CORRUPT("unaligned key offset for file extent", + leaf, root, slot); + return -EUCLEAN; + } + + fi = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item); + + if (btrfs_file_extent_type(leaf, fi) >= BTRFS_FILE_EXTENT_LAST_TYPE) { + CORRUPT("invalid file extent type", leaf, root, slot); + return -EUCLEAN; + } + + /* + * Support for new compression/encrption must introduce incompat flag, + * and must be caught in open_ctree(). + */ + if (btrfs_file_extent_compression(leaf, fi) >= BTRFS_COMPRESS_LAST) { + CORRUPT("invalid file extent compression", leaf, root, slot); + return -EUCLEAN; + } + if (btrfs_file_extent_encryption(leaf, fi)) { + CORRUPT("invalid file extent encryption", leaf, root, slot); + return -EUCLEAN; + } + if (btrfs_file_extent_type(leaf, fi) == BTRFS_FILE_EXTENT_INLINE) { + /* Inline extent must have 0 as key offset */ + if (key->offset) { + CORRUPT("inline extent has non-zero key offset", + leaf, root, slot); + return -EUCLEAN; + } + + /* Compressed inline extent has no on-disk size, skip it */ + if (btrfs_file_extent_compression(leaf, fi) != + BTRFS_COMPRESS_NONE) + return 0; + + /* Plaintext inline extent size must match item size */ + if (item_size != BTRFS_FILE_EXTENT_INLINE_DATA_START + + btrfs_file_extent_ram_bytes(leaf, fi)) { + CORRUPT("plaintext inline extent has invalid size", + leaf, root, slot); + return -EUCLEAN; + } + return 0; + } + + + /* regular or preallocated extent has fixed item size */ + if (item_size != sizeof(*fi)) { + CORRUPT( + "regluar or preallocated extent data item size is invalid", + leaf, root, slot); + return -EUCLEAN; + } + if (!IS_ALIGNED(btrfs_file_extent_ram_bytes(leaf, fi), sectorsize) || + !IS_ALIGNED(btrfs_file_extent_disk_bytenr(leaf, fi), sectorsize) || + !IS_ALIGNED(btrfs_file_extent_disk_num_bytes(leaf, fi), + sectorsize) || + !IS_ALIGNED(btrfs_file_extent_offset(leaf, fi), sectorsize) || + !IS_ALIGNED(btrfs_file_extent_num_bytes(leaf, fi), sectorsize)) { + CORRUPT( + "regular or preallocated extent data item has unaligned value", + leaf, root, slot); + return -EUCLEAN; + } + + return 0; +} + +static int check_leaf_item(struct btrfs_root *root, + struct extent_buffer *leaf, + struct btrfs_key *key, int slot) +{ + int ret = 0; + + /* + * Considering how overcrowded the code will be inside the switch, + * complex verification is better to moved its own function. + */ + switch (key->type) { + case BTRFS_EXTENT_DATA_KEY: + ret = check_extent_data_item(root, leaf, key, slot); + break; + } + return ret; +} + static noinline int check_leaf(struct btrfs_root *root, struct extent_buffer *leaf) { @@ -605,9 +702,13 @@ static noinline int check_leaf(struct btrfs_root *root, * 1) key order * 2) item offset and size * No overlap, no hole, all inside the leaf. + * 3) item content + * If possible, do comprehensive sanity check. + * NOTE: All check must only rely on the item data itself. */ for (slot = 0; slot < nritems; slot++) { u32 item_end_expected; + int ret; btrfs_item_key_to_cpu(leaf, &key, slot); @@ -650,6 +751,13 @@ static noinline int check_leaf(struct btrfs_root *root, return -EUCLEAN; } + /* + * Check if the item size and content meets other limitation + */ + ret = check_leaf_item(root, leaf, &key, slot); + if (ret < 0) + return ret; + prev_key.objectid = key.objectid; prev_key.type = key.type; prev_key.offset = key.offset; diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index 10689e1fdf11..3aadbb74a024 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -732,6 +732,7 @@ struct btrfs_balance_item { #define BTRFS_FILE_EXTENT_INLINE 0 #define BTRFS_FILE_EXTENT_REG 1 #define BTRFS_FILE_EXTENT_PREALLOC 2 +#define BTRFS_FILE_EXTENT_LAST_TYPE 3 struct btrfs_file_extent_item { /*
Add extra checker for item with EXTENT_DATA type. This checks the following thing: 0) Key offset All key offset must be aligned to sectorsize. Inline extent must have 0 for key offset. 1) Item size Plain text inline file extent size must match item size. (compressed inline file extent has no info about its on-disk size) Regular/preallocated file extent size must be a fixed value. 2) Every member of regular file extent item Including alignment for bytenr and offset, possible value for compression/encryption/type. 3) Type/compression/encode must be one of the valid values. This should be the most comprehensive and restrict check in the context of btrfs_item for EXTENT_DATA. Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> --- fs/btrfs/disk-io.c | 108 ++++++++++++++++++++++++++++++++++++++++ include/uapi/linux/btrfs_tree.h | 1 + 2 files changed, 109 insertions(+)