]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
fs: btrfs: inode: handle uninitialized type before returning it
authorQu Wenruo <wqu@suse.com>
Sat, 31 Oct 2020 01:07:49 +0000 (09:07 +0800)
committerTom Rini <trini@konsulko.com>
Thu, 19 Nov 2020 14:45:49 +0000 (09:45 -0500)
In btrfs_lookup_path() the local variable @type should always be updated
after we hit any file/dir.

But if @filename is NULL from the very beginning, then we don't
initialize it and return it directly.

To prevent such problem from happening, we initialize @type to
BTRFS_FT_UNKNOWN.
For normal execution route, it will get updated for each filename we
resolved.
Buf if we didn't find any path, we check if the type is still FT_UNKNOWN
and ret == 0. If true we know there is something wrong, just return
-EUCLEAN to inform the caller.

Reported-by: Coverity CID 312958
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Marek BehĂșn <marek.behun@nic.cz>
fs/btrfs/inode.c

index ff330280e025bb15fe44255e57f0de4703119239..019d532a1a4bc2f41288f02cfea4259f78d206f0 100644 (file)
@@ -251,7 +251,7 @@ int btrfs_lookup_path(struct btrfs_root *root, u64 ino, const char *filename,
        const char *cur = filename;
        u64 next_ino;
        u8 next_type;
-       u8 type;
+       u8 type = BTRFS_FT_UNKNOWN;
        int len;
        int ret = 0;
 
@@ -335,6 +335,10 @@ next:
                cur += len;
        }
 
+       /* We haven't found anything, but still get no error? */
+       if (type == BTRFS_FT_UNKNOWN && !ret)
+               ret = -EUCLEAN;
+
        if (!ret) {
                *root_ret = root;
                *ino_ret = ino;