Commit 11fc88c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-5.17-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs updates from Darrick Wong:
 "The big new feature here is that the mount code now only bothers to
  try to free stale COW staging extents if the fs unmounted uncleanly.
  This should reduce mount times, particularly on filesystems supporting
  reflink and containing a large number of allocation groups.

  Everything else this cycle are bugfixes, as the iomap folios
  conversion should be plenty enough excitement for anyone. That and I
  ran out of brain bandwidth after Thanksgiving last year.

  Summary:

   - Fix log recovery with da btree buffers when metauuid is in use.

   - Fix type coercion problems in xattr buffer size validation.

   - Fix a bug in online scrub dir leaf bestcount checking.

   - Only run COW recovery when recovering the log.

   - Fix symlink target buffer UAF problems and symlink locking problems
     by not exposing xfs innards to the VFS.

   - Fix incorrect quotaoff lock usage.

   - Don't let transactions cancel cleanly if they have deferred work
     items attached.

   - Fix a UAF when we're deciding if we need to relog an intent item.

   - Reduce kvmalloc overhead for log shadow buffers.

   - Clean up sysfs attr group usage.

   - Fix a bug where scrub's bmap/rmap checking could race with a quota
     file block allocation due to insufficient locking.

   - Teach scrub to complain about invalid project ids"

* tag 'xfs-5.17-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: warn about inodes with project id of -1
  xfs: hold quota inode ILOCK_EXCL until the end of dqalloc
  xfs: Remove redundant assignment of mp
  xfs: reduce kvmalloc overhead for CIL shadow buffers
  xfs: sysfs: use default_groups in kobj_type
  xfs: prevent UAF in xfs_log_item_in_current_chkpt
  xfs: prevent a WARN_ONCE() in xfs_ioc_attr_list()
  xfs: Fix comments mentioning xfs_ialloc
  xfs: check sb_meta_uuid for dabuf buffer recovery
  xfs: fix a bug in the online fsck directory leaf1 bestcount check
  xfs: only run COW extent recovery when there are no live extents
  xfs: don't expose internal symlink metadata buffers to the vfs
  xfs: fix quotaoff mutex usage now that we don't support disabling it
  xfs: shut down filesystem if we xfs_trans_cancel with deferred work items
parents d601e58c 7e937bb3

fs/xfs/scrub/dir.c

+11 −4
Original line number Diff line number Diff line
@@ -497,6 +497,7 @@ STATIC int 
xchk_directory_leaf1_bestfree(

	struct xfs_scrub		*sc,

	struct xfs_da_args		*args,

	xfs_dir2_db_t			last_data_db,

	xfs_dablk_t			lblk)

{

	struct xfs_dir3_icleaf_hdr	leafhdr;
@@ -534,10 +535,14 @@ xchk_directory_leaf1_bestfree( 
	}



	/*

	 * There should be as many bestfree slots as there are dir data

	 * blocks that can fit under i_size.

	 * There must be enough bestfree slots to cover all the directory data

	 * blocks that we scanned.  It is possible for there to be a hole

	 * between the last data block and i_disk_size.  This seems like an

	 * oversight to the scrub author, but as we have been writing out

	 * directories like this (and xfs_repair doesn't mind them) for years,

	 * that's what we have to check.

	 */

	if (bestcount != xfs_dir2_byte_to_db(geo, sc->ip->i_disk_size)) {

	if (bestcount != last_data_db + 1) {

		xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, lblk);

		goto out;

	}
@@ -669,6 +674,7 @@ xchk_directory_blocks( 
	xfs_fileoff_t		lblk;

	struct xfs_iext_cursor	icur;

	xfs_dablk_t		dabno;

	xfs_dir2_db_t		last_data_db = 0;

	bool			found;

	int			is_block = 0;

	int			error;
@@ -712,6 +718,7 @@ xchk_directory_blocks( 
				args.geo->fsbcount);

		     lblk < got.br_startoff + got.br_blockcount;

		     lblk += args.geo->fsbcount) {

			last_data_db = xfs_dir2_da_to_db(args.geo, lblk);

			error = xchk_directory_data_bestfree(sc, lblk,

					is_block);

			if (error)
@@ -734,7 +741,7 @@ xchk_directory_blocks( 
			xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, lblk);

			goto out;

		}

		error = xchk_directory_leaf1_bestfree(sc, &args,

		error = xchk_directory_leaf1_bestfree(sc, &args, last_data_db,

				leaf_lblk);

		if (error)

			goto out;

fs/xfs/scrub/inode.c

+14 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ xchk_dinode( 
	unsigned long long	isize;

	uint64_t		flags2;

	uint32_t		nextents;

	prid_t			prid;

	uint16_t		flags;

	uint16_t		mode;
@@ -267,6 +268,7 @@ xchk_dinode( 
		 * so just mark this inode for preening.

		 */

		xchk_ino_set_preen(sc, ino);

		prid = 0;

		break;

	case 2:

	case 3:
@@ -279,12 +281,17 @@ xchk_dinode( 
		if (dip->di_projid_hi != 0 &&

		    !xfs_has_projid32(mp))

			xchk_ino_set_corrupt(sc, ino);



		prid = be16_to_cpu(dip->di_projid_lo);

		break;

	default:

		xchk_ino_set_corrupt(sc, ino);

		return;

	}



	if (xfs_has_projid32(mp))

		prid |= (prid_t)be16_to_cpu(dip->di_projid_hi) << 16;



	/*

	 * di_uid/di_gid -- -1 isn't invalid, but there's no way that

	 * userspace could have created that.
@@ -293,6 +300,13 @@ xchk_dinode( 
	    dip->di_gid == cpu_to_be32(-1U))

		xchk_ino_set_warning(sc, ino);



	/*

	 * project id of -1 isn't supposed to be valid, but the kernel didn't

	 * always validate that.

	 */

	if (prid == -1U)

		xchk_ino_set_warning(sc, ino);



	/* di_format */

	switch (dip->di_format) {

	case XFS_DINODE_FMT_DEV:

fs/xfs/scrub/quota.c

+2 −2
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ xchk_setup_quota( 
	dqtype = xchk_quota_to_dqtype(sc);

	if (dqtype == 0)

		return -EINVAL;

	sc->flags |= XCHK_HAS_QUOTAOFFLOCK;

	mutex_lock(&sc->mp->m_quotainfo->qi_quotaofflock);



	if (!xfs_this_quota_on(sc->mp, dqtype))

		return -ENOENT;



	error = xchk_setup_fs(sc);

	if (error)

		return error;

fs/xfs/scrub/repair.c

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "xfs_ag.h"

#include "xfs_ag_resv.h"

#include "xfs_quota.h"

#include "xfs_qm.h"

#include "scrub/scrub.h"

#include "scrub/common.h"

#include "scrub/trace.h"
@@ -912,11 +913,13 @@ xrep_force_quotacheck( 
	if (!(flag & sc->mp->m_qflags))

		return;



	mutex_lock(&sc->mp->m_quotainfo->qi_quotaofflock);

	sc->mp->m_qflags &= ~flag;

	spin_lock(&sc->mp->m_sb_lock);

	sc->mp->m_sb.sb_qflags &= ~flag;

	spin_unlock(&sc->mp->m_sb_lock);

	xfs_log_sb(sc->tp);

	mutex_unlock(&sc->mp->m_quotainfo->qi_quotaofflock);

}



/*

fs/xfs/scrub/scrub.c

+0 −4
Original line number Diff line number Diff line
@@ -173,10 +173,6 @@ xchk_teardown( 
		mnt_drop_write_file(sc->file);

	if (sc->flags & XCHK_REAPING_DISABLED)

		xchk_start_reaping(sc);

	if (sc->flags & XCHK_HAS_QUOTAOFFLOCK) {

		mutex_unlock(&sc->mp->m_quotainfo->qi_quotaofflock);

		sc->flags &= ~XCHK_HAS_QUOTAOFFLOCK;

	}

	if (sc->buf) {

		kmem_free(sc->buf);

		sc->buf = NULL;