Commit 26eca105 authored Nov 05, 2019 by Chengguang Xu Committed by Greg Kroah-Hartman Dec 17, 2019

ext2: check err when partial != NULL

commit e705f4b8aa27a59f8933e8f384e9752f052c469c upstream.

Check err when partial == NULL is meaningless because
partial == NULL means getting branch successfully without
error.

CC: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20191105045100.7104-1-cgxu519@mykernel.net


Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 77b14d6e

fs/ext2/inode.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -699,10 +699,13 @@ static int ext2_get_blocks(struct inode *inode,
		if (!partial) {
		count++;
		mutex_unlock(&ei->truncate_mutex);
		if (err)
		goto cleanup;
		goto got_it;
		}

		if (err) {
		mutex_unlock(&ei->truncate_mutex);
		goto cleanup;
		}
		}

		/*