From e35d548b59e24af9f7fc18396e8880df96d1bc51 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 2 Jan 2009 18:14:42 -0500 Subject: [PATCH] e2fsck: Fix journal replay for block sizes greater than 8k E2fsck was using a fixed-size 8k buffer for replaying blocks from the journal. So attempts to replay a journal on filesystems greater than 8k would cause e2fsck to crash with a segfault. Thanks to Miao Xie for reporting this problem. Signed-off-by: "Theodore Ts'o" --- e2fsck/jfs_user.h | 2 +- e2fsck/journal.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/e2fsck/jfs_user.h b/e2fsck/jfs_user.h index 0e4f951..60cc682 100644 --- a/e2fsck/jfs_user.h +++ b/e2fsck/jfs_user.h @@ -15,7 +15,6 @@ #include "e2fsck.h" struct buffer_head { - char b_data[8192]; e2fsck_t b_ctx; io_channel b_io; int b_size; @@ -23,6 +22,7 @@ struct buffer_head { int b_dirty; int b_uptodate; int b_err; + char b_data[1024]; }; struct inode { diff --git a/e2fsck/journal.c b/e2fsck/journal.c index 10f5095..adbd3db 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -68,8 +68,10 @@ int journal_bmap(journal_t *journal, blk_t block, unsigned long *phys) struct buffer_head *getblk(kdev_t kdev, blk_t blocknr, int blocksize) { struct buffer_head *bh; + int bufsize = sizeof(*bh) + kdev->k_ctx->fs->blocksize - + sizeof(bh->b_data); - bh = e2fsck_allocate_memory(kdev->k_ctx, sizeof(*bh), "block buffer"); + bh = e2fsck_allocate_memory(kdev->k_ctx, bufsize, "block buffer"); if (!bh) return NULL; -- 1.8.3.1