xfs
[Top] [All Lists]

Re: [PATCH] xfs_repair: set args.geo in dir2_kill_block

To: xfs-oss <xfs@xxxxxxxxxxx>
Subject: Re: [PATCH] xfs_repair: set args.geo in dir2_kill_block
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Tue, 25 Aug 2015 11:55:56 -0500
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <55B14B40.5030209@xxxxxxxxxxx>
References: <55B14B40.5030209@xxxxxxxxxxx>
Dave, ping on this?

Thanks,
-Eric

On 7/23/15 3:14 PM, Eric Sandeen wrote:
> This path in xfs_repair:
> 
> dir2_kill_block
>       libxfs_da_shrink_inode
>               xfs_dir2_shrink_inode
>                       xfs_dir2_db_to_da
> 
> segfaults, because dir2_kill_block() does not initialize
> args.geo, and a null geometry winds up in xfs_dir2_db_to_da(),
> which dereferences it.
> 
> Fix that.
> 
> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
> ---
> 
> diff --git a/repair/phase6.c b/repair/phase6.c
> index de445c6..0c952ed 100644
> --- a/repair/phase6.c
> +++ b/repair/phase6.c
> @@ -1438,6 +1438,7 @@ dir2_kill_block(
>       args.firstblock = &firstblock;
>       args.flist = &flist;
>       args.whichfork = XFS_DATA_FORK;
> +     args.geo = mp->m_dir_geo;
>       if (da_bno >= mp->m_dir_geo->leafblk && da_bno < mp->m_dir_geo->freeblk)
>               error = -libxfs_da_shrink_inode(&args, da_bno, bp);
>       else
> 
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
> 

<Prev in Thread] Current Thread [Next in Thread>
  • Re: [PATCH] xfs_repair: set args.geo in dir2_kill_block, Eric Sandeen <=