Commit 85d76aec authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Dave Chinner
Browse files

xfs: reject unknown xattri log item filter flags during recovery 



Make sure we screen the "attr flags" field of recovered xattr intent log
items to reject flag bits that we don't know about.  This is really the
attr *filter* field from xfs_da_args, so rename the field and create
a mask to make checking for invalid bits easier.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarAllison Henderson <allison.henderson@oracle.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 356cb708

fs/xfs/libxfs/xfs_log_format.h

+9 −1
Original line number Diff line number Diff line
@@ -911,6 +911,14 @@ struct xfs_icreate_log { 
#define XFS_ATTR_OP_FLAGS_REPLACE	3	/* Replace the attribute */

#define XFS_ATTR_OP_FLAGS_TYPE_MASK	0xFF	/* Flags type mask */



/*

 * alfi_attr_filter captures the state of xfs_da_args.attr_filter, so it should

 * never have any other bits set.

 */

#define XFS_ATTRI_FILTER_MASK		(XFS_ATTR_ROOT | \

					 XFS_ATTR_SECURE | \

					 XFS_ATTR_INCOMPLETE)



/*

 * This is the structure used to lay out an attr log item in the

 * log.
@@ -924,7 +932,7 @@ struct xfs_attri_log_format { 
	uint32_t	alfi_op_flags;	/* marks the op as a set or remove */

	uint32_t	alfi_name_len;	/* attr name length */

	uint32_t	alfi_value_len;	/* attr value length */

	uint32_t	alfi_attr_flags;/* attr flags */

	uint32_t	alfi_attr_filter;/* attr filter flags */

};



struct xfs_attrd_log_format {

fs/xfs/xfs_attr_item.c

+7 −3
Original line number Diff line number Diff line
@@ -353,7 +353,8 @@ xfs_attr_log_item( 
	attrp->alfi_op_flags = attr->xattri_op_flags;

	attrp->alfi_value_len = attr->xattri_da_args->valuelen;

	attrp->alfi_name_len = attr->xattri_da_args->namelen;

	attrp->alfi_attr_flags = attr->xattri_da_args->attr_filter;

	ASSERT(!(attr->xattri_da_args->attr_filter & ~XFS_ATTRI_FILTER_MASK));

	attrp->alfi_attr_filter = attr->xattri_da_args->attr_filter;



	memcpy(attrip->attri_name, attr->xattri_da_args->name,

	       attr->xattri_da_args->namelen);
@@ -500,6 +501,9 @@ xfs_attri_validate( 
	if (attrp->alfi_op_flags & ~XFS_ATTR_OP_FLAGS_TYPE_MASK)

		return false;



	if (attrp->alfi_attr_filter & ~XFS_ATTRI_FILTER_MASK)

		return false;



	/* alfi_op_flags should be either a set or remove */

	switch (op) {

	case XFS_ATTR_OP_FLAGS_SET:
@@ -569,7 +573,7 @@ xfs_attri_item_recover( 
	args->name = attrip->attri_name;

	args->namelen = attrp->alfi_name_len;

	args->hashval = xfs_da_hashname(args->name, args->namelen);

	args->attr_filter = attrp->alfi_attr_flags;

	args->attr_filter = attrp->alfi_attr_filter & XFS_ATTRI_FILTER_MASK;

	args->op_flags = XFS_DA_OP_RECOVERY | XFS_DA_OP_OKNOENT;



	switch (attr->xattri_op_flags) {
@@ -658,7 +662,7 @@ xfs_attri_item_relog( 
	new_attrp->alfi_op_flags = old_attrp->alfi_op_flags;

	new_attrp->alfi_value_len = old_attrp->alfi_value_len;

	new_attrp->alfi_name_len = old_attrp->alfi_name_len;

	new_attrp->alfi_attr_flags = old_attrp->alfi_attr_flags;

	new_attrp->alfi_attr_filter = old_attrp->alfi_attr_filter;



	memcpy(new_attrip->attri_name, old_attrip->attri_name,

		new_attrip->attri_name_len);