2011-09-30 19:39:58

by djwong

Subject: [PATCH] e2fsck: When restarting fsck on account of MMP, zero ctx->fs after fs is freed

If MMP is enabled and e2fsck determines that it needs to restart itself on
account of various MMP conditions, it will close the current fs and jump back
to the start of fs checking. However, closing fs also frees it, which means
that we need to set ctx->fs to NULL to prevent subsequent open code from
accessing the old deleted pointer.

(This fix came up while testing the metadata checksumming patchset)

Signed-off-by: Darrick J. Wong <[email protected]>
---

e2fsck/unix.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index f980962..37cfb00 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -1351,6 +1351,7 @@ failure:
* Restart in order to reopen fs but this time start mmp.
*/
if (flags & EXT2_FLAG_SKIP_MMP) {
+ ctx->fs = NULL;
ext2fs_close(fs);
flags &= ~EXT2_FLAG_SKIP_MMP;
goto restart;

2011-09-30 21:38:14

by Theodore Ts'o

Subject: Re: [PATCH] e2fsck: When restarting fsck on account of MMP, zero ctx->fs after fs is freed

On Fri, Sep 30, 2011 at 12:40:05PM -0700, Darrick J. Wong wrote:
> If MMP is enabled and e2fsck determines that it needs to restart itself on
> account of various MMP conditions, it will close the current fs and jump back
> to the start of fs checking. However, closing fs also frees it, which means
> that we need to set ctx->fs to NULL to prevent subsequent open code from
> accessing the old deleted pointer.
>
> (This fix came up while testing the metadata checksumming patchset)
>
> Signed-off-by: Darrick J. Wong <[email protected]>

Thanks, applied.

- Ted