From 6ffb5554eddc57bb19a766ac5c3a4dda85c115c9 Mon Sep 17 00:00:00 2001 From: liuzerun Date: Thu, 4 Jan 2024 19:49:54 +0000 Subject: [PATCH] fixed 25335e8 from https://gitee.com/yang-bo-e/kernel_linux_5.10/pulls/1221 add judge err Signed-off-by: liuzerun --- fs/hmdfs/inode_cloud_merge.c | 4 ++++ fs/hmdfs/inode_merge.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/fs/hmdfs/inode_cloud_merge.c b/fs/hmdfs/inode_cloud_merge.c index 37e99f0554e2..550dce3781b5 100644 --- a/fs/hmdfs/inode_cloud_merge.c +++ b/fs/hmdfs/inode_cloud_merge.c @@ -326,6 +326,10 @@ struct dentry *hmdfs_lookup_cloud_merge(struct inode *parent_inode, child_inode = fill_inode_merge(parent_inode->i_sb, parent_inode, child_dentry, NULL); + if (IS_ERR(child_inode)) { + err = PTR_ERR(child_inode); + goto out; + } info = hmdfs_i(child_inode); if (info->inode_type == HMDFS_LAYER_FIRST_MERGE) hmdfs_root_inode_perm_init(child_inode); diff --git a/fs/hmdfs/inode_merge.c b/fs/hmdfs/inode_merge.c index e466c66aabc8..91eaef3164b7 100644 --- a/fs/hmdfs/inode_merge.c +++ b/fs/hmdfs/inode_merge.c @@ -739,6 +739,10 @@ struct dentry *hmdfs_lookup_merge(struct inode *parent_inode, child_inode = fill_inode_merge(parent_inode->i_sb, parent_inode, child_dentry, NULL); + if (IS_ERR(child_inode)) { + err = PTR_ERR(child_inode); + goto out; + } info = hmdfs_i(child_inode); if (info->inode_type == HMDFS_LAYER_FIRST_MERGE) hmdfs_root_inode_perm_init(child_inode); -- Gitee