Commit e12b243d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-5.3-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs fixes from Darrick Wong:

 - Avoid leaking kernel stack contents to userspace

 - Fix a potential null pointer dereference in the dabtree scrub code

* tag 'xfs-5.3-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: Fix possible null-pointer dereferences in xchk_da_btree_block_check_sibling()
  xfs: fix stack contents leakage in the v1 inumber ioctls
parents b7aea68a afa1d96d

fs/xfs/scrub/dabtree.c

+5 −1
Original line number Diff line number Diff line
@@ -278,7 +278,11 @@ xchk_da_btree_block_check_sibling( 
	/* Compare upper level pointer to sibling pointer. */

	if (ds->state->altpath.blk[level].blkno != sibling)

		xchk_da_set_corrupt(ds, level);

	xfs_trans_brelse(ds->dargs.trans, ds->state->altpath.blk[level].bp);

	if (ds->state->altpath.blk[level].bp) {

		xfs_trans_brelse(ds->dargs.trans,

				ds->state->altpath.blk[level].bp);

		ds->state->altpath.blk[level].bp = NULL;

	}

out:

	return error;

}

fs/xfs/xfs_itable.c

+3 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ xfs_bulkstat_to_bstat( 
	struct xfs_bstat		*bs1,

	const struct xfs_bulkstat	*bstat)

{

	/* memset is needed here because of padding holes in the structure. */

	memset(bs1, 0, sizeof(struct xfs_bstat));

	bs1->bs_ino = bstat->bs_ino;

	bs1->bs_mode = bstat->bs_mode;
@@ -388,6 +389,8 @@ xfs_inumbers_to_inogrp( 
	struct xfs_inogrp		*ig1,

	const struct xfs_inumbers	*ig)

{

	/* memset is needed here because of padding holes in the structure. */

	memset(ig1, 0, sizeof(struct xfs_inogrp));

	ig1->xi_startino = ig->xi_startino;

	ig1->xi_alloccount = ig->xi_alloccount;

	ig1->xi_allocmask = ig->xi_allocmask;

CRA Git | Maintained and supported by SUSTech CRA and CCSE