]> git.itanic.dy.fi Git - linux-stable/commitdiff
erofs: fix error return code in erofs_read_superblock()
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 19 May 2021 14:16:57 +0000 (14:16 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Jul 2021 15:07:50 +0000 (17:07 +0200)
commit 0508c1ad0f264a24c4643701823a45f6c9bd8146 upstream.

'ret' will be overwritten to 0 if erofs_sb_has_sb_chksum() return true,
thus 0 will return in some error handling cases. Fix to return negative
error code -EINVAL instead of 0.

Link: https://lore.kernel.org/r/20210519141657.3062715-1-weiyongjun1@huawei.com
Fixes: b858a4844cfb ("erofs: support superblock checksum")
Cc: stable <stable@vger.kernel.org> # 5.5+
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Gao Xiang <xiang@kernel.org>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Gao Xiang <xiang@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/erofs/super.c

index bbf3bbd908e0816e4d4d894a69431c58f0c95b3f..22991d22af5a2d92e6455a104763925b58256600 100644 (file)
@@ -285,6 +285,7 @@ static int erofs_read_superblock(struct super_block *sb)
                        goto out;
        }
 
+       ret = -EINVAL;
        blkszbits = dsb->blkszbits;
        /* 9(512 bytes) + LOG_SECTORS_PER_BLOCK == LOG_BLOCK_SIZE */
        if (blkszbits != LOG_BLOCK_SIZE) {