Commit add3efdd authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o

jbd2: Fix possible overflow in jbd2_log_space_left()

When number of free space in the journal is very low, the arithmetic in
jbd2_log_space_left() could underflow resulting in very high number of
free blocks and thus triggering assertion failure in transaction commit
code complaining there's not enough space in the journal:

J_ASSERT(journal->j_free > 1);

Properly check for the low number of free blocks.

CC: stable@vger.kernel.org
Reviewed-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20191105164437.32602-1-jack@suse.czSigned-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 4f5cafb5
...@@ -1582,7 +1582,7 @@ static inline int jbd2_space_needed(journal_t *journal) ...@@ -1582,7 +1582,7 @@ static inline int jbd2_space_needed(journal_t *journal)
static inline unsigned long jbd2_log_space_left(journal_t *journal) static inline unsigned long jbd2_log_space_left(journal_t *journal)
{ {
/* Allow for rounding errors */ /* Allow for rounding errors */
unsigned long free = journal->j_free - 32; long free = journal->j_free - 32;
if (journal->j_committing_transaction) { if (journal->j_committing_transaction) {
unsigned long committing = atomic_read(&journal-> unsigned long committing = atomic_read(&journal->
...@@ -1591,7 +1591,7 @@ static inline unsigned long jbd2_log_space_left(journal_t *journal) ...@@ -1591,7 +1591,7 @@ static inline unsigned long jbd2_log_space_left(journal_t *journal)
/* Transaction + control blocks */ /* Transaction + control blocks */
free -= committing + (committing >> JBD2_CONTROL_BLOCKS_SHIFT); free -= committing + (committing >> JBD2_CONTROL_BLOCKS_SHIFT);
} }
return free; return max_t(long, free, 0);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment