Commit 928a87ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gfs2-v6.8-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull gfs2 fix from Andreas Gruenbacher:

 - Fix boundary check in punch_hole

* tag 'gfs2-v6.8-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Fix invalid metadata access in punch_hole
parents 174fdc93 c95346ac

fs/gfs2/bmap.c

+3 −2
Original line number Diff line number Diff line
@@ -1718,7 +1718,8 @@ static int punch_hole(struct gfs2_inode *ip, u64 offset, u64 length) 
	struct buffer_head *dibh, *bh;

	struct gfs2_holder rd_gh;

	unsigned int bsize_shift = sdp->sd_sb.sb_bsize_shift;

	u64 lblock = (offset + (1 << bsize_shift) - 1) >> bsize_shift;

	unsigned int bsize = 1 << bsize_shift;

	u64 lblock = (offset + bsize - 1) >> bsize_shift;

	__u16 start_list[GFS2_MAX_META_HEIGHT];

	__u16 __end_list[GFS2_MAX_META_HEIGHT], *end_list = NULL;

	unsigned int start_aligned, end_aligned;
@@ -1729,7 +1730,7 @@ static int punch_hole(struct gfs2_inode *ip, u64 offset, u64 length) 
	u64 prev_bnr = 0;

	__be64 *start, *end;



	if (offset >= maxsize) {

	if (offset + bsize - 1 >= maxsize) {

		/*

		 * The starting point lies beyond the allocated metadata;

		 * there are no blocks to deallocate.