From: Wei Yongjun weiyongjun1@huawei.com
stable inclusion from stable-5.10.50 commit 51c19f4a62129bca096df760c7690833958ce9cf bugzilla: 174522 https://gitee.com/openeuler/kernel/issues/I4DNFY
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...
--------------------------------
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
Signed-off-by: Chen Jun chenjun102@huawei.com Acked-by: Weilong Chen chenweilong@huawei.com Signed-off-by: Chen Jun chenjun102@huawei.com --- fs/erofs/super.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/fs/erofs/super.c b/fs/erofs/super.c index d5a6b9b888a5..f31a08d86be8 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -155,6 +155,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) {