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

Commit a122eb2f authored by Dan Rosenberg's avatar Dan Rosenberg Committed by Alex Elder
Browse files

xfs: prevent reading uninitialized stack memory 



The XFS_IOC_FSGETXATTR ioctl allows unprivileged users to read 12
bytes of uninitialized stack memory, because the fsxattr struct
declared on the stack in xfs_ioc_fsgetxattr() does not alter (or zero)
the 12-byte fsx_pad member before copying it back to the user.  This
patch takes care of it.

Signed-off-by: default avatarDan Rosenberg <dan.j.rosenberg@gmail.com>
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent cc491e27

fs/xfs/linux-2.6/xfs_ioctl.c

+2 −0
Original line number Diff line number Diff line
@@ -785,6 +785,8 @@ xfs_ioc_fsgetxattr( 
{

	struct fsxattr		fa;



	memset(&fa, 0, sizeof(struct fsxattr));



	xfs_ilock(ip, XFS_ILOCK_SHARED);

	fa.fsx_xflags = xfs_ip2xflags(ip);

	fa.fsx_extsize = ip->i_d.di_extsize << ip->i_mount->m_sb.sb_blocklog;