Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecf4cb65 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Greg Kroah-Hartman
Browse files

gfs2: Another gfs2_walk_metadata fix 



[ Upstream commit 566a2ab3c9005f62e784bd39022d58d34ef4365c ]

Make sure we don't walk past the end of the metadata in gfs2_walk_metadata: the
inode holds fewer pointers than indirect blocks.

Slightly clean up gfs2_iomap_get.

Fixes: a27a0c9b6a20 ("gfs2: gfs2_walk_metadata fix")
Cc: stable@vger.kernel.org # v5.3+
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0a79765b

fs/gfs2/bmap.c

+9 −7
Original line number Diff line number Diff line
@@ -530,10 +530,12 @@ static int gfs2_walk_metadata(struct inode *inode, struct metapath *mp, 


		/* Advance in metadata tree. */

		(mp->mp_list[hgt])++;

		if (mp->mp_list[hgt] >= sdp->sd_inptrs) {

			if (!hgt)

				break;

		if (hgt) {

			if (mp->mp_list[hgt] >= sdp->sd_inptrs)

				goto lower_metapath;

		} else {

			if (mp->mp_list[hgt] >= sdp->sd_diptrs)

				break;

		}



fill_up_metapath:
@@ -879,10 +881,9 @@ static int gfs2_iomap_get(struct inode *inode, loff_t pos, loff_t length, 
					ret = -ENOENT;

					goto unlock;

				} else {

					/* report a hole */

					iomap->offset = pos;

					iomap->length = length;

					goto do_alloc;

					goto hole_found;

				}

			}

			iomap->length = size;
@@ -936,8 +937,6 @@ static int gfs2_iomap_get(struct inode *inode, loff_t pos, loff_t length, 
	return ret;



do_alloc:

	iomap->addr = IOMAP_NULL_ADDR;

	iomap->type = IOMAP_HOLE;

	if (flags & IOMAP_REPORT) {

		if (pos >= size)

			ret = -ENOENT;
@@ -959,6 +958,9 @@ static int gfs2_iomap_get(struct inode *inode, loff_t pos, loff_t length, 
		if (pos < size && height == ip->i_height)

			ret = gfs2_hole_size(inode, lblock, len, mp, iomap);

	}

hole_found:

	iomap->addr = IOMAP_NULL_ADDR;

	iomap->type = IOMAP_HOLE;

	goto out;

}