From: Abhi Das <adas@redhat.com>
Date: Wed, 12 Mar 2014 08:41:44 +0000 (-0500)
Subject: GFS2: check NULL return value in gfs2_ok_to_move
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=48f8f711edf3868fe4faa28a19f07acb43532c4a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

GFS2: check NULL return value in gfs2_ok_to_move

gfs2_lookupi() can return NULL if the path to the root is broken by
another rename/rmdir. In this case gfs2_ok_to_move() must check for
this NULL pointer and return error.

Resolves: rhbz#1060246
Signed-off-by: Abhi Das <adas@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index ec455b92091f..b52ebf8553c2 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -1299,6 +1299,10 @@ static int gfs2_ok_to_move(struct gfs2_inode *this, struct gfs2_inode *to)
 		}
 
 		tmp = gfs2_lookupi(dir, &gfs2_qdotdot, 1);
+		if (!tmp) {
+			error = -ENOENT;
+			break;
+		}
 		if (IS_ERR(tmp)) {
 			error = PTR_ERR(tmp);
 			break;