diff options
Diffstat (limited to 'e2fsck')
| -rw-r--r-- | e2fsck/recovery.c | 10 | ||||
| -rw-r--r-- | e2fsck/revoke.c | 26 |
2 files changed, 23 insertions, 13 deletions
diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c index b5ce3b3c..d5244be2 100644 --- a/e2fsck/recovery.c +++ b/e2fsck/recovery.c @@ -839,15 +839,23 @@ static int scan_revoke_records(journal_t *journal, struct buffer_head *bh, { journal_revoke_header_t *header; int offset, max; + int csum_size = 0; + __u32 rcount; int record_len = 4; header = (journal_revoke_header_t *) bh->b_data; offset = sizeof(journal_revoke_header_t); - max = ext2fs_be32_to_cpu(header->r_count); + rcount = ext2fs_be32_to_cpu(header->r_count); if (!jbd2_revoke_block_csum_verify(journal, header)) return -EINVAL; + if (journal_has_csum_v2or3(journal)) + csum_size = sizeof(struct journal_revoke_tail); + if (rcount > journal->j_blocksize - csum_size) + return -EINVAL; + max = rcount; + if (JFS_HAS_INCOMPAT_FEATURE(journal, JFS_FEATURE_INCOMPAT_64BIT)) record_len = 8; diff --git a/e2fsck/revoke.c b/e2fsck/revoke.c index b4c3f5f4..05430997 100644 --- a/e2fsck/revoke.c +++ b/e2fsck/revoke.c @@ -583,7 +583,7 @@ static void write_one_revoke_record(journal_t *journal, { int csum_size = 0; struct buffer_head *descriptor; - int offset; + int sz, offset; journal_header_t *header; /* If we are already aborting, this all becomes a noop. We @@ -600,9 +600,14 @@ static void write_one_revoke_record(journal_t *journal, if (journal_has_csum_v2or3(journal)) csum_size = sizeof(struct journal_revoke_tail); + if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_64BIT)) + sz = 8; + else + sz = 4; + /* Make sure we have a descriptor with space left for the record */ if (descriptor) { - if (offset >= journal->j_blocksize - csum_size) { + if (offset + sz > journal->j_blocksize - csum_size) { flush_descriptor(journal, descriptor, offset, write_op); descriptor = NULL; } @@ -625,16 +630,13 @@ static void write_one_revoke_record(journal_t *journal, *descriptorp = descriptor; } - if (JFS_HAS_INCOMPAT_FEATURE(journal, JFS_FEATURE_INCOMPAT_64BIT)) { - * ((__u64 *)(&descriptor->b_data[offset])) = - ext2fs_cpu_to_be64(record->blocknr); - offset += 8; - - } else { - * ((__u32 *)(&descriptor->b_data[offset])) = - ext2fs_cpu_to_be32(record->blocknr); - offset += 4; - } + if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_64BIT)) { + * ((__be64 *)(&descriptor->b_data[offset])) = + cpu_to_be64(record->blocknr); + else + * ((__be32 *)(&descriptor->b_data[offset])) = + cpu_to_be32(record->blocknr); + offset += sz; *offsetp = offset; } |