LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Dan Rosenberg <drosenberg@vsecurity.com>
To: Dave Chinner <david@fromorbit.com>,
	aelder@sgi.com, xfs-masters@oss.sgi.com, xfs@oss.sgi.com
Cc: linux-kernel@vger.kernel.org, stable@kernel.org, security@kernel.org
Subject: [PATCH v2] xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
Date: Mon, 14 Feb 2011 08:45:28 -0500	[thread overview]
Message-ID: <1297691128.1857.4.camel@dan> (raw)
In-Reply-To: <20110214114629.GA13052@dastard>

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>
---
 fs/xfs/xfs_fsops.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index cec89dd..85668ef 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;



  reply	other threads:[~2011-02-14 13:45 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-10 14:25 [PATCH] " Dan Rosenberg
2011-02-14  8:41 ` [Security] " Eugene Teo
2011-02-14 11:46 ` Dave Chinner
2011-02-14 13:45   ` Dan Rosenberg [this message]
2011-02-14 23:39     ` [PATCH v2] " Eugene Teo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1297691128.1857.4.camel@dan \
    --to=drosenberg@vsecurity.com \
    --cc=aelder@sgi.com \
    --cc=david@fromorbit.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=security@kernel.org \
    --cc=stable@kernel.org \
    --cc=xfs-masters@oss.sgi.com \
    --cc=xfs@oss.sgi.com \
    --subject='Re: [PATCH v2] xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).