On Wed, Mar 20, 2019 at 02:37:16PM +0800, Qu Wenruo wrote:
> @@ -1539,6 +1539,8 @@ do {                                                    
>                \
>  #define BTRFS_INODE_COMPRESS         (1 << 11)
>  
>  #define BTRFS_INODE_ROOT_ITEM_INIT   (1 << 31)
> +#define BTRFS_INODE_FLAG_MASK                (((1 << 12) - 1) |\
> +                                      BTRFS_INODE_ROOT_ITEM_INIT)

That's fragile, the mask constant should enumerate all bits it's
supposed to cover, like

+#define BTRFS_INODE_FLAG_MASK                                          \
+       (BTRFS_INODE_NODATASUM |                                        \
+        BTRFS_INODE_NODATACOW |                                        \
+        BTRFS_INODE_READONLY |                                         \
+        BTRFS_INODE_NOCOMPRESS |                                       \
+        BTRFS_INODE_PREALLOC |                                         \
+        BTRFS_INODE_SYNC |                                             \
+        BTRFS_INODE_IMMUTABLE |                                        \
+        BTRFS_INODE_APPEND |                                           \
+        BTRFS_INODE_NODUMP |                                           \
+        BTRFS_INODE_NOATIME |                                          \
+        BTRFS_INODE_DIRSYNC |                                          \
+        BTRFS_INODE_COMPRESS |                                         \
+        BTRFS_INODE_ROOT_ITEM_INIT)
+

> +     u64 super_gen = btrfs_super_generation(fs_info->super_copy);
> +     u32 valid_mask = (S_IFMT | S_ISUID | S_ISGID | S_ISVTX | 0777);
> +     u32 mode;
> +
> +     if ((key->objectid < BTRFS_FIRST_FREE_OBJECTID ||
> +          key->objectid > BTRFS_LAST_FREE_OBJECTID) &&
> +          key->objectid != BTRFS_ROOT_TREE_DIR_OBJECTID &&
> +          key->objectid != BTRFS_FREE_INO_OBJECTID) {
> +             generic_err(fs_info, leaf, slot,
> +     "invalid key objectid: has %llu expect %llu or [%llu, %llu] or %llu",
> +                         key->objectid, BTRFS_ROOT_TREE_DIR_OBJECTID,
> +                         BTRFS_FIRST_FREE_OBJECTID,
> +                         BTRFS_LAST_FREE_OBJECTID,
> +                         BTRFS_FREE_INO_OBJECTID);
> +             goto error;
> +     }
> +     if (key->offset != 0) {
> +             inode_item_err(fs_info, leaf, slot,
> +                     "invalid key offset: has %llu expect 0",
> +                     key->offset);
> +             goto error;
> +     }
> +     iitem = btrfs_item_ptr(leaf, slot, struct btrfs_inode_item);
> +
> +     /* Here we use super block generation + 1 to handle log tree */
> +     if (btrfs_inode_generation(leaf, iitem) > super_gen + 1) {
> +             inode_item_err(fs_info, leaf, slot,
> +                     "invalid inode generation: has %llu expect (0, %llu]",
> +                            btrfs_inode_generation(leaf, iitem),
> +                            super_gen + 1);
> +             goto error;
> +     }
> +     /* Note for ROOT_TREE_DIR_ITEM, mkfs could make its transid as 0 */
> +     if (btrfs_inode_transid(leaf, iitem) > super_gen + 1) {
> +             inode_item_err(fs_info, leaf, slot,
> +                     "invalid inode generation: has %llu expect [0, %llu]",
> +                            btrfs_inode_transid(leaf, iitem),
> +                            super_gen + 1);
> +             goto error;
> +     }
> +
> +     /*
> +      * For size and nbytes it's better not to be too strict, as for dir
> +      * item its size/nbytes can easily get wrong, but doesn't affect
> +      * any thing of the fs. So here we skip the check.
> +      */
> +
> +     mode = btrfs_inode_mode(leaf, iitem);
> +     if (mode & ~valid_mask) {
> +             inode_item_err(fs_info, leaf, slot,
> +                            "unknown mode bit detected: 0x%x",
> +                            mode & ~valid_mask);
> +             goto error;
> +     }
> +
> +     /*
> +      * S_IFMT is not bit mapped so we can't completely rely is_power_of_2(),
> +      * but is_power_of_2() can save us from checking FIFO/CHR/DIR/REG.
> +      * Only needs to check BLK, LNK and SOCKS
> +      */
> +     if (!is_power_of_2(mode & S_IFMT)) {
> +             if (!S_ISLNK(mode) && ! S_ISBLK(mode) && !S_ISSOCK(mode)) {
> +                     inode_item_err(fs_info, leaf, slot,
> +                     "invalid mode: has 0%o expect valid S_IF* bit(s)",
> +                                    mode & S_IFMT);
> +                     goto error;
> +             }
> +     }
> +     if (S_ISDIR(mode) && btrfs_inode_nlink(leaf, iitem) > 1) {
> +             inode_item_err(fs_info, leaf, slot,
> +                            "invalid nlink: has %u expect no more than 1 for 
> dir",
> +                     btrfs_inode_nlink(leaf, iitem));
> +             goto error;
> +     }
> +     if (btrfs_inode_flags(leaf, iitem) & ~BTRFS_INODE_FLAG_MASK) {
> +             inode_item_err(fs_info, leaf, slot,
> +                            "unknown flags detected: 0x%llx",
> +                            btrfs_inode_flags(leaf, iitem) &
> +                            ~BTRFS_INODE_FLAG_MASK);
> +             goto error;
> +     }
> +     return 0;
> +
> +error:
> +     return -EUCLEAN;

Switched to local returns instead of gotos.

Reply via email to