diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2005-07-25 11:36:43 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2005-07-25 11:36:43 -0500 |
| commit | b28a6e96af53338c303e0f25e28ea02705a1d680 (patch) | |
| tree | 989543f490ecbf72362ddaccc506ee50fd6eee61 /e2fsck | |
| parent | 274315957221e81be28fd0c2265dc553207f9a3b (diff) | |
| download | e2fsprogs-b28a6e96af53338c303e0f25e28ea02705a1d680.tar.gz | |
Fix use-after-free bug of e2fsck context structure.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'e2fsck')
| -rw-r--r-- | e2fsck/ChangeLog | 3 | ||||
| -rw-r--r-- | e2fsck/unix.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index 53cbbb05..deec7eab 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,5 +1,8 @@ 2005-07-25 Theodore Ts'o <tytso@mit.edu> + * unix.c (main): Fix a use-after-free bug of the e2fsck context + structure at the very end of the e2fsck run. + * pass1.c (pass1_write_inode): Fix false positive from valgrind; don't do a needless structure copy via an assignment when it is a no-op. diff --git a/e2fsck/unix.c b/e2fsck/unix.c index 1d74929d..6cbcb10c 100644 --- a/e2fsck/unix.c +++ b/e2fsck/unix.c @@ -1168,12 +1168,11 @@ restart: ctx->fs = NULL; free(ctx->filesystem_name); free(ctx->journal_name); - e2fsck_free_context(ctx); - + #ifdef RESOURCE_TRACK if (ctx->options & E2F_OPT_TIME) print_resource_track(NULL, &ctx->global_rtrack); #endif - + e2fsck_free_context(ctx); return exit_value; } |