linux-kernel - Re: [PATCH 4.4 49/91] ext4: preserve the needs_recovery flag when the journal is aborted

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170310201406.n4w3vhmrcr4xmcyt@thunk.org>
Date:   Fri, 10 Mar 2017 15:14:06 -0500
From:   Theodore Ts'o <tytso@....edu>
To:     Ben Hutchings <ben@...adent.org.uk>
Cc:     stable@...r.kernel.org,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH 4.4 49/91] ext4: preserve the needs_recovery flag when
 the journal is aborted

On Fri, Mar 10, 2017 at 04:58:02PM +0000, Ben Hutchings wrote:
> > ---
> >  fs/ext4/super.c |    6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > --- a/fs/ext4/super.c
> > +++ b/fs/ext4/super.c
> [...]
> > @@ -802,9 +803,10 @@ static void ext4_put_super(struct super_
> >  	destroy_workqueue(sbi->rsv_conversion_wq);
> >  
> >  	if (sbi->s_journal) {
> > +		aborted = is_journal_aborted(sbi->s_journal);
> >  		err = jbd2_journal_destroy(sbi->s_journal);
> >  		sbi->s_journal = NULL;
> > -		if (err < 0)
> > +		if ((err < 0) && !aborted)
> >  			ext4_abort(sb, "Couldn't clean up the journal");
> [...]
> 
> Shouldn't the aborted flag also be set here when err < 0?

Nice catch.  That's a separate issue (the bug was there before this
commit), though I'll send a separate patch to fix this in mainline and
then cc stable, OK?

						- Ted