From d6c9efd92443b23307995f34246c2374056ebbd8 Mon Sep 17 00:00:00 2001

From: Tetsuhiro Kohada <kohada.t2@gmail.com>

Date: Wed, 26 Aug 2020 10:18:29 +0900

Subject: [Backport d6c9efd92443] exfat: fix pointer error checking

Fix missing result check of exfat_build_inode().

And use PTR_ERR_OR_ZERO instead of PTR_ERR.

Signed-off-by: Tetsuhiro Kohada <kohada.t2@gmail.com>

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>

---

 src/namei.c | 13 ++++++-------

 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/namei.c b/src/namei.c

index e73f20f66cb2e1c1c3c20b4a62bad8210fda6e8b..c94ac239f740b0bbce1d9a51b9ea6b820c6b7f33 100644

--- a/src/namei.c

+++ b/src/namei.c

@@ -578,7 +578,8 @@ static int exfat_create(struct inode *dir, struct dentry *dentry, umode_t mode,

 	i_pos = exfat_make_i_pos(&info;;

 	inode = exfat_build_inode(sb, &info, i_pos);

-	if (IS_ERR(inode))

+	err = PTR_ERR_OR_ZERO(inode);

+	if (err)

 		goto unlock;

 	inode_inc_iversion(inode);

@@ -745,10 +746,9 @@ static struct dentry *exfat_lookup(struct inode *dir, struct dentry *dentry,

 	i_pos = exfat_make_i_pos(&info;;

 	inode = exfat_build_inode(sb, &info, i_pos);

-	if (IS_ERR(inode)) {

-		err = PTR_ERR(inode);

+	err = PTR_ERR_OR_ZERO(inode);

+	if (err)

 		goto unlock;

-	}

 	i_mode = inode->i_mode;

 	alias = d_find_alias(inode);

@@ -890,10 +890,9 @@ static int exfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)

 	i_pos = exfat_make_i_pos(&info;;

 	inode = exfat_build_inode(sb, &info, i_pos);

-	if (IS_ERR(inode)) {

-		err = PTR_ERR(inode);

+	err = PTR_ERR_OR_ZERO(inode);

+	if (err)

 		goto unlock;

-	}

 	inode_inc_iversion(inode);

 	inode->i_mtime = inode->i_atime = inode->i_ctime =

-- 

2.31.1