[PATCH] [8/106] xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1

From: Andi Kleen
Date: Tue Apr 26 2011 - 17:39:37 EST


2.6.35-longterm review patch. If anyone has any objections, please let me know.

------------------
From: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>

commit c4d0c3b097f7584772316ee4d64a09fe0e4ddfca 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: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Reviewed-by: Eugene Teo <eugeneteo@xxxxxxxxxx>
Signed-off-by: Alex Elder <aelder@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

---
fs/xfs/xfs_fsops.c | 3 +++
1 file changed, 3 insertions(+)

Index: linux-2.6.35.y/fs/xfs/xfs_fsops.c
===================================================================
--- linux-2.6.35.y.orig/fs/xfs/xfs_fsops.c
+++ linux-2.6.35.y/fs/xfs/xfs_fsops.c
@@ -57,6 +57,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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/