summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorDan Rosenberg <drosenberg@vsecurity.com>2011-02-14 13:45:28 +0000
committerAlex Elder <aelder@sgi.com>2011-02-22 15:06:47 -0600
commit3a3675b7f23f83ca8c67c9c2b6edf707fd28d1ba (patch)
treeca218171c9493272b40a4bb9c9a2099ba1240a47 /fs
parentd8204a37baf5474d3154eb536c936369be2bd5c0 (diff)
downloadlinux-3.10-3a3675b7f23f83ca8c67c9c2b6edf707fd28d1ba.tar.gz
linux-3.10-3a3675b7f23f83ca8c67c9c2b6edf707fd28d1ba.tar.bz2
linux-3.10-3a3675b7f23f83ca8c67c9c2b6edf707fd28d1ba.zip
xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
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: Dan Rosenberg <drosenberg@vsecurity.com> Reviewed-by: Eugene Teo <eugeneteo@kernel.org> Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_fsops.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index cec89dd5d7d..85668efb3e3 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -53,6 +53,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;