diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-10-27 14:10:52 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-10-27 15:25:32 -0400 |
| commit | dfbea44e16c36f7024be081c87c78d9f7105d854 (patch) | |
| tree | 79ffd223e178d88d74ac4d70ad5ce8c312e69408 | |
| parent | ffa65a9a280acc85ddd028059fa4df88dddaac26 (diff) | |
bcachefs: Fix stack corruptionbcachefs-for-review
A bkey_on_stack_realloc() call was in the wrong place, and broken for
indirect extents
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/fs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c index 5af66df0a650..bd6b6048ea22 100644 --- a/fs/bcachefs/fs.c +++ b/fs/bcachefs/fs.c @@ -897,9 +897,7 @@ retry: bkey_start_offset(k.k); sectors = k.k->size - offset_into_extent; - bkey_on_stack_realloc(&cur, c, k.k->u64s); - bkey_on_stack_realloc(&prev, c, k.k->u64s); - bkey_reassemble(cur.k, k); + bkey_on_stack_reassemble(&cur, c, k); ret = bch2_read_indirect_extent(&trans, &offset_into_extent, &cur); @@ -907,6 +905,7 @@ retry: break; k = bkey_i_to_s_c(cur.k); + bkey_on_stack_realloc(&prev, c, k.k->u64s); sectors = min(sectors, k.k->size - offset_into_extent); |