diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-10-27 14:10:52 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-11-05 12:45:14 -0500 |
| commit | 1bb2bf6b2c10fdc78c8c17653069274ad29343b3 (patch) | |
| tree | 8acdd4b2bc6842c83290bc24f4da03d3fb9e7254 | |
| parent | 46ca751f4d3f2a7e28d392b1cc1a673ff0e533c0 (diff) | |
bcachefs: Fix stack corruption
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 02f51068f60f..7be0642f0a3e 100644 --- a/fs/bcachefs/fs.c +++ b/fs/bcachefs/fs.c @@ -908,9 +908,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); @@ -918,6 +916,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); |