aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2021-02-13 10:35:50 -0500
committerTheodore Ts'o <tytso@mit.edu>2021-02-13 10:35:50 -0500
commit28e22540e24fd2a70b8adf805fad4961f5234d21 (patch)
treeabcb81b6774f6b1c3dd6ab304f38930f7d2ac24c
parent462c424500a592723887b861f857650523bab359 (diff)
downloade2fsprogs-28e22540e24fd2a70b8adf805fad4961f5234d21.tar.gz
debugfs: fix logdump on file systems with block sizes > 8192
Addresses-Coverity-Bug: 1472879 Addresses-Coverity-Bug: 1472880 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r--debugfs/logdump.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/debugfs/logdump.c b/debugfs/logdump.c
index 5d3f3d9a..6826b250 100644
--- a/debugfs/logdump.c
+++ b/debugfs/logdump.c
@@ -350,7 +350,7 @@ static void dump_journal(char *cmdname, FILE *out_file,
{
struct ext2_super_block *sb;
char jsb_buffer[1024];
- char buf[8192];
+ char buf[EXT2_MAX_BLOCK_SIZE];
journal_superblock_t *jsb;
unsigned int blocksize = 1024;
int retval;
@@ -409,7 +409,7 @@ static void dump_journal(char *cmdname, FILE *out_file,
blocksize = be32_to_cpu(jsb->s_blocksize);
if ((current_fs && (blocksize != current_fs->blocksize)) ||
(!current_fs && (!blocksize || (blocksize & (blocksize - 1)) ||
- (blocksize > 65536)))) {
+ (blocksize > EXT2_MAX_BLOCK_SIZE)))) {
fprintf(out_file,
"Journal block size invalid: %u (%u)\n",
be32_to_cpu(jsb->s_blocksize), blocksize);