From: Dave Chinner <david@fromorbit.com>
To: Eric Sandeen <sandeen@redhat.com>
Cc: linux-xfs@vger.kernel.org, xfs-oss <xfs@oss.sgi.com>,
Consigliere <admin@russenmafia.at>
Subject: Re: [PATCH] xfs_repair: fix segfault from uninitialized tp in mv_orphanage
Date: Thu, 22 Sep 2016 08:19:38 +1000 [thread overview]
Message-ID: <20160921221938.GD10454@dastard> (raw)
In-Reply-To: <bb6c5861-23eb-dbd9-bf47-393c9445c9a2@redhat.com>
On Wed, Sep 21, 2016 at 12:52:56PM -0500, Eric Sandeen wrote:
> After 9074815 xfs: better xfs_trans_alloc interface, mv_orphanage
> was passing an uninitialized *tp into libxfs_dir_lookup, because
> the trans_alloc() call which was present prior to the call got
> removed in that commit.
>
> This ultimately led to testing an uninit tp var:
>
> Conditional jump or move depends on uninitialised value(s)
> at 0x434D01: libxfs_trans_read_buf_map (trans.c:554)
> by 0x45152E: libxfs_da_read_buf (xfs_da_btree.c:2610)
> by 0x456ACB: xfs_dir3_block_read (xfs_dir2_block.c:136)
> by 0x4570A8: xfs_dir2_block_lookup_int (xfs_dir2_block.c:675)
> by 0x457DB7: xfs_dir2_block_lookup (xfs_dir2_block.c:623)
> by 0x455F54: libxfs_dir_lookup (xfs_dir2.c:399)
> by 0x421C46: mv_orphanage (phase6.c:1095)
> by 0x4222C2: check_for_orphaned_inodes (phase6.c:3108)
> by 0x423ABD: phase6 (phase6.c:3287)
> by 0x42E4B2: main (xfs_repair.c:933)
>
> and ended with a segfault as we tried to use that tp when
> searching for the buffer in xfs_trans_buf_item_match():
>
> list_for_each_entry(lidp, &tp->t_items, lid_trans) {
>
> I think simply passing in NULL for this tp is sufficient to fix
> this; we'll just go read the buffer from disk in
> libxfs_trans_read_buf_map rather than trying to find it in an
> existing transaction.
>
> Reported-by: Consigliere <admin@russenmafia.at>
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> ---
>
> diff --git a/repair/phase6.c b/repair/phase6.c
> index 973a5f8..5507af4 100644
> --- a/repair/phase6.c
> +++ b/repair/phase6.c
> @@ -1092,7 +1092,7 @@ mv_orphanage(
> irec->ino_startnum;
> nres = XFS_DIRENTER_SPACE_RES(mp, fnamelen) +
> XFS_DIRENTER_SPACE_RES(mp, 2);
> - err = -libxfs_dir_lookup(tp, ino_p, &xfs_name_dotdot,
> + err = -libxfs_dir_lookup(NULL, ino_p, &xfs_name_dotdot,
> &entry_ino_num, NULL);
> if (err) {
> ASSERT(err == ENOENT);
Yup, looks fine. tp is definitely not valid in that scope, and we
join the inode that we look up to the transaction when appropriate.
I'll push this in soon.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
prev parent reply other threads:[~2016-09-21 22:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-21 17:52 [PATCH] xfs_repair: fix segfault from uninitialized tp in mv_orphanage Eric Sandeen
2016-09-21 22:19 ` Dave Chinner [this message]
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=20160921221938.GD10454@dastard \
--to=david@fromorbit.com \
--cc=admin@russenmafia.at \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@redhat.com \
--cc=xfs@oss.sgi.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox