Commit e22b468f authored by Dan Rosenberg's avatar Dan Rosenberg Committed by Greg Kroah-Hartman

xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1

commit c4d0c3b0 upstream.

The FSGEOMETRY_V1 ioctl (and its compat equivalent) calls out to
xfs_fs_geometry() with a version number of 3.  This code path does not
fill in the logsunit member of the passed xfs_fsop_geom_t, leading to
the leaking of four bytes of uninitialized stack data to potentially
unprivileged callers.

v2 switches to memset() to avoid future issues if structure members
change, on suggestion of Dave Chinner.
Signed-off-by: default avatarDan Rosenberg <drosenberg@vsecurity.com>
Reviewed-by: default avatarEugene Teo <eugeneteo@kernel.org>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bd94ab29
......@@ -56,6 +56,9 @@ xfs_fs_geometry(
xfs_fsop_geom_t *geo,
int new_version)
{
memset(geo, 0, sizeof(*geo));
geo->blocksize = mp->m_sb.sb_blocksize;
geo->rtextsize = mp->m_sb.sb_rextsize;
geo->agblocks = mp->m_sb.sb_agblocks;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment