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

Commit 31978b5c authored by Dan Carpenter's avatar Dan Carpenter Committed by Ben Myers
Browse files

xfs: underflow bug in xfs_attrlist_by_handle() 



If we allocate less than sizeof(struct attrlist) then we end up
corrupting memory or doing a ZERO_PTR_SIZE dereference.

This can only be triggered with CAP_SYS_ADMIN.

Reported-by: default avatarNico Golde <nico@ngolde.de>
Reported-by: default avatarFabian Yamaguchi <fabs@goesec.de>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>

(cherry picked from commit 071c529e)
parent dc1ccc48

fs/xfs/xfs_ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -442,7 +442,8 @@ xfs_attrlist_by_handle( 
		return -XFS_ERROR(EPERM);

	if (copy_from_user(&al_hreq, arg, sizeof(xfs_fsop_attrlist_handlereq_t)))

		return -XFS_ERROR(EFAULT);

	if (al_hreq.buflen > XATTR_LIST_MAX)

	if (al_hreq.buflen < sizeof(struct attrlist) ||

	    al_hreq.buflen > XATTR_LIST_MAX)

		return -XFS_ERROR(EINVAL);



	/*

fs/xfs/xfs_ioctl32.c

+2 −1
Original line number Diff line number Diff line
@@ -356,7 +356,8 @@ xfs_compat_attrlist_by_handle( 
	if (copy_from_user(&al_hreq, arg,

			   sizeof(compat_xfs_fsop_attrlist_handlereq_t)))

		return -XFS_ERROR(EFAULT);

	if (al_hreq.buflen > XATTR_LIST_MAX)

	if (al_hreq.buflen < sizeof(struct attrlist) ||

	    al_hreq.buflen > XATTR_LIST_MAX)

		return -XFS_ERROR(EINVAL);



	/*