diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-22 23:19:27 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:09:45 +0300 |
| commit | 1f69368c5cfce6770d101aaeff46ef22d22de07c (patch) | |
| tree | 7269375de6ce6f670b2c75c29ede7012655d2b27 /fs/bcachefs/btree_iter.c | |
| parent | df6a24f81aa29a0e844afb53f7d5bc8989cdbac3 (diff) | |
| download | linux-1f69368c5cfce6770d101aaeff46ef22d22de07c.tar.xz | |
bcachefs: Fix an out-of-bounds shift
roundup_pow_of_two() is undefined for 0 - oops.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_iter.c')
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 15bf079e17ab..611f7b0ca014 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -2879,7 +2879,7 @@ void __bch2_trans_init(struct btree_trans *trans, struct bch_fs *c, unsigned fn_ bch2_trans_alloc_paths(trans, c); s = btree_trans_stats(trans); - if (s) { + if (s && s->max_mem) { unsigned expected_mem_bytes = roundup_pow_of_two(s->max_mem); trans->mem = kmalloc(expected_mem_bytes, GFP_KERNEL); @@ -2890,9 +2890,9 @@ void __bch2_trans_init(struct btree_trans *trans, struct bch_fs *c, unsigned fn_ } else { trans->mem_bytes = expected_mem_bytes; } - - trans->nr_max_paths = s->nr_max_paths; } + if (s) + trans->nr_max_paths = s->nr_max_paths; trans->srcu_idx = srcu_read_lock(&c->btree_trans_barrier); |