[Cluster-devel] [GFS2 PATCH] GFS2: check NULL return value in gfs2_ok_to_move

[Steven Whitehouse]

Hi,

On Wed, 2014-03-12 at 03:41 -0500, Abhi Das wrote:
> 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 at redhat.com>

Thanks for the patch. I've added it to the -nmw tree,

Steve.

> ---
>  fs/gfs2/inode.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
> index ec455b9..b52ebf8 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;