[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1308851366.5295.1.camel@dan>
Date: Thu, 23 Jun 2011 13:49:26 -0400
From: Dan Rosenberg <drosenberg@...curity.com>
To: Paul Gortmaker <paul.gortmaker@...driver.com>
Cc: stable@...nel.org, linux-kernel@...r.kernel.org,
stable-review@...nel.org, Alex Elder <aelder@....com>
Subject: Re: [34-longterm 238/247] xfs: prevent leaking uninitialized stack
memory in FSGEOMETRY_V1
On Thu, 2011-06-23 at 13:35 -0400, Paul Gortmaker wrote:
> From: Dan Rosenberg <drosenberg@...curity.com>
>
> -------------------
> This is a commit scheduled for the next v2.6.34 longterm release.
> If you see a problem with using this for longterm, please comment.
> -------------------
>
> commit 3a3675b7f23f83ca8c67c9c2b6edf707fd28d1ba 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@...curity.com>
> Reviewed-by: Eugene Teo <eugeneteo@...nel.org>
> Signed-off-by: Alex Elder <aelder@....com>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@...driver.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 37a6f62..4e7f02b 100644
> --- a/fs/xfs/xfs_fsops.c
> +++ b/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;
> --
> 1.7.4.4
This introduced a regression which was fixed by commit
af24ee9ea8d532e16883251a6684dfa1be8eec29.
-Dan
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists