Skip to contentSkip to conversation

btrfs: add lzo workspace buffer length constants

PATCH In review Dāvis Mosāns 4 participants 7 messages Feb 2, 2022 – Feb 10, 2022 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 btrfs: add lzo workspace buffer length constants

It makes it more readable for length checking

---
 fs/btrfs/lzo.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
fs/btrfs/lzo.c +6 -3
index 0fb90cbe7669..31319dfcc9fb 100644
@@ -55,6 +55,9 @@
  * 0x1000   | SegHdr N+1| Data payload N+1 ...                |
  */
 
+#define WORKSPACE_BUF_LENGTH lzo1x_worst_compress(PAGE_SIZE)
+#define WORKSPACE_CBUF_LENGTH lzo1x_worst_compress(PAGE_SIZE)
+
 struct workspace {
 	void *mem;
 	void *buf;	/* where decompressed data goes */
@@ -83,8 +86,8 @@ struct list_head *lzo_alloc_workspace(unsigned int level)
 		return ERR_PTR(-ENOMEM);
 
 	workspace->mem = kvmalloc(LZO1X_MEM_COMPRESS, GFP_KERNEL);
-	workspace->buf = kvmalloc(lzo1x_worst_compress(PAGE_SIZE), GFP_KERNEL);
-	workspace->cbuf = kvmalloc(lzo1x_worst_compress(PAGE_SIZE), GFP_KERNEL);
+	workspace->buf = kvmalloc(WORKSPACE_BUF_LENGTH, GFP_KERNEL);
+	workspace->cbuf = kvmalloc(WORKSPACE_CBUF_LENGTH, GFP_KERNEL);
 	if (!workspace->mem || !workspace->buf || !workspace->cbuf)
 		goto fail;
 
@@ -422,7 +425,7 @@ int lzo_decompress(struct list_head *ws, unsigned char *data_in,
 	struct workspace *workspace = list_entry(ws, struct workspace, list);
 	size_t in_len;
 	size_t out_len;
-	size_t max_segment_len = lzo1x_worst_compress(PAGE_SIZE);
+	size_t max_segment_len = WORKSPACE_BUF_LENGTH;
 	int ret = 0;
 	char *kaddr;
 	unsigned long bytes;
Signature · 1 line
2.35.1
#1 lore raw

PATCH 2/2 btrfs: prevent copying too big compressed lzo segment

Compressed length can be corrupted to be a lot larger than memory we have allocated for buffer.
This will cause memcpy in copy_compressed_segment to write outside of allocated memory.

This mostly results in stuck read syscall but sometimes when using btrfs send can get #GP

kernel: general protection fault, probably for non-canonical address 0x841551d5c1000: 0000 [#1] PREEMPT SMP NOPTI
kernel: CPU: 17 PID: 264 Comm: kworker/u256:7 Tainted: P OE 5.17.0-rc2-1 #12
kernel: Workqueue: btrfs-endio btrfs_work_helper [btrfs]
kernel: RIP: 0010:lzo_decompress_bio (./include/linux/fortify-string.h:225 fs/btrfs/lzo.c:322 fs/btrfs/lzo.c:394) btrfs Code starting with the faulting instruction
===========================================

   0:*  48 8b 06                mov    (%rsi),%rax              <-- trapping instruction
   3:   48 8d 79 08             lea    0x8(%rcx),%rdi
   7:   48 83 e7 f8             and    $0xfffffffffffffff8,%rdi
   b:   48 89 01                mov    %rax,(%rcx)
   e:   44 89 f0                mov    %r14d,%eax
  11:   48 8b 54 06 f8          mov    -0x8(%rsi,%rax,1),%rdx
kernel: RSP: 0018:ffffb110812efd50 EFLAGS: 00010212
kernel: RAX: 0000000000001000 RBX: 000000009ca264c8 RCX: ffff98996e6d8ff8
kernel: RDX: 0000000000000064 RSI: 000841551d5c1000 RDI: ffffffff9500435d
kernel: RBP: ffff989a3be856c0 R08: 0000000000000000 R09: 0000000000000000
kernel: R10: 0000000000000000 R11: 0000000000001000 R12: ffff98996e6d8000
kernel: R13: 0000000000000008 R14: 0000000000001000 R15: 000841551d5c1000
kernel: FS:  0000000000000000(0000) GS:ffff98a09d640000(0000) knlGS:0000000000000000
kernel: CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
kernel: CR2: 00001e9f984d9ea8 CR3: 000000014971a000 CR4: 00000000003506e0
kernel: Call Trace:
kernel:  <TASK>
kernel: end_compressed_bio_read (fs/btrfs/compression.c:104 fs/btrfs/compression.c:1363 fs/btrfs/compression.c:323) btrfs
kernel: end_workqueue_fn (fs/btrfs/disk-io.c:1923) btrfs
kernel: btrfs_work_helper (fs/btrfs/async-thread.c:326) btrfs
kernel: process_one_work (./arch/x86/include/asm/jump_label.h:27 ./include/linux/jump_label.h:212 ./include/trace/events/workqueue.h:108 kernel/workqueue.c:2312)
kernel: worker_thread (./include/linux/list.h:292 kernel/workqueue.c:2455)
kernel: ? process_one_work (kernel/workqueue.c:2397)
kernel: kthread (kernel/kthread.c:377)
kernel: ? kthread_complete_and_exit (kernel/kthread.c:332)
kernel: ret_from_fork (arch/x86/entry/entry_64.S:301)
kernel:  </TASK>
---
 fs/btrfs/lzo.c | 7 +++++++
 1 file changed, 7 insertions(+)
fs/btrfs/lzo.c +7 -0
index 31319dfcc9fb..ebaa5083f2ae 100644
@@ -383,6 +383,13 @@ int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb)
 		kunmap(cur_page);
 		cur_in += LZO_LEN;
 
+		if (seg_len > WORKSPACE_CBUF_LENGTH) {
+			// seg_len shouldn't be larger than we have allocated for workspace->cbuf
+			btrfs_err(fs_info, "unexpectedly large lzo segment len %u", seg_len);
+			ret = -EUCLEAN;
+			goto out;
+		}
+
 		/* Copy the compressed segment payload into workspace */
 		copy_compressed_segment(cb, workspace->cbuf, seg_len, &cur_in);
 
Signature · 1 line
2.35.1
#2 lore raw

Re: [PATCH 2/2] btrfs: prevent copying too big compressed lzo segment

Quoted 59 lines · Dāvis Mosāns

Compressed length can be corrupted to be a lot larger than memory we have allocated for buffer.
This will cause memcpy in copy_compressed_segment to write outside of allocated memory.

This mostly results in stuck read syscall but sometimes when using btrfs send can get #GP

kernel: general protection fault, probably for non-canonical address 0x841551d5c1000: 0000 [#1] PREEMPT SMP NOPTI
kernel: CPU: 17 PID: 264 Comm: kworker/u256:7 Tainted: P OE 5.17.0-rc2-1 #12
kernel: Workqueue: btrfs-endio btrfs_work_helper [btrfs]
kernel: RIP: 0010:lzo_decompress_bio (./include/linux/fortify-string.h:225 fs/btrfs/lzo.c:322 fs/btrfs/lzo.c:394) btrfs Code starting with the faulting instruction
===========================================
0:* 48 8b 06 mov (%rsi),%rax
<-- trapping instruction

   3:   48 8d 79 08             lea    0x8(%rcx),%rdi
   7:   48 83 e7 f8             and    $0xfffffffffffffff8,%rdi
   b:   48 89 01                mov    %rax,(%rcx)
   e:   44 89 f0                mov    %r14d,%eax
  11:   48 8b 54 06 f8          mov    -0x8(%rsi,%rax,1),%rdx
kernel: RSP: 0018:ffffb110812efd50 EFLAGS: 00010212
kernel: RAX: 0000000000001000 RBX: 000000009ca264c8 RCX: ffff98996e6d8ff8
kernel: RDX: 0000000000000064 RSI: 000841551d5c1000 RDI: ffffffff9500435d
kernel: RBP: ffff989a3be856c0 R08: 0000000000000000 R09: 0000000000000000
kernel: R10: 0000000000000000 R11: 0000000000001000 R12: ffff98996e6d8000
kernel: R13: 0000000000000008 R14: 0000000000001000 R15: 000841551d5c1000
kernel: FS:  0000000000000000(0000) GS:ffff98a09d640000(0000) knlGS:0000000000000000
kernel: CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
kernel: CR2: 00001e9f984d9ea8 CR3: 000000014971a000 CR4: 00000000003506e0
kernel: Call Trace:
kernel:  <TASK>
kernel: end_compressed_bio_read (fs/btrfs/compression.c:104 fs/btrfs/compression.c:1363 fs/btrfs/compression.c:323) btrfs
kernel: end_workqueue_fn (fs/btrfs/disk-io.c:1923) btrfs
kernel: btrfs_work_helper (fs/btrfs/async-thread.c:326) btrfs
kernel: process_one_work (./arch/x86/include/asm/jump_label.h:27 ./include/linux/jump_label.h:212 ./include/trace/events/workqueue.h:108 kernel/workqueue.c:2312)
kernel: worker_thread (./include/linux/list.h:292 kernel/workqueue.c:2455)
kernel: ? process_one_work (kernel/workqueue.c:2397)
kernel: kthread (kernel/kthread.c:377)
kernel: ? kthread_complete_and_exit (kernel/kthread.c:332)
kernel: ret_from_fork (arch/x86/entry/entry_64.S:301)
kernel:  </TASK>
---
 fs/btrfs/lzo.c | 7 +++++++
 1 file changed, 7 insertions(+)
fs/btrfs/lzo.c +2 -0
index 31319dfcc9fb..ebaa5083f2ae 100644
@@ -383,6 +383,13 @@ int lzo_decompress_bio(struct list_head 
 *ws, struct compressed_bio *cb)
 		kunmap(cur_page);
 		cur_in += LZO_LEN;
 
+		if (seg_len > WORKSPACE_CBUF_LENGTH) {
+			// seg_len shouldn't be larger than we 
Quoted 2 lines

have allocated for workspace->cbuf

Makes sense.
Is the corrupted lzo compressed extent produced by a normal fs or crafted manually? If it is from a normal fs, something insane happened in extent compressed path.

--
Su

Quoted 10 lines
fs/btrfs/lzo.c +1 -0
+			btrfs_err(fs_info, "unexpectedly large lzo 

segment len %u", seg_len);

fs/btrfs/lzo.c +4 -0
+			ret = -EUCLEAN;
+			goto out;
+		}
+
 		/* Copy the compressed segment payload into 
 workspace */
 		copy_compressed_segment(cb, workspace->cbuf, 
 seg_len, &cur_in);
#3 lore raw

Re: [PATCH 2/2] btrfs: prevent copying too big compressed lzo segment

ceturtd., 2022. g. 3. febr., plkst. 15:33 — lietotājs Su Yue (<[email protected]>) rakstīja:

Quoted 80 lines
Quoted 75 lines · Dāvis Mosāns

Compressed length can be corrupted to be a lot larger than memory
we have allocated for buffer.
This will cause memcpy in copy_compressed_segment to write outside
of allocated memory.

This mostly results in stuck read syscall but sometimes when using
btrfs send can get #GP

kernel: general protection fault, probably for non-canonical address 0x841551d5c1000: 0000 [#1] PREEMPT SMP NOPTI
kernel: CPU: 17 PID: 264 Comm: kworker/u256:7 Tainted: P
OE 5.17.0-rc2-1 #12
kernel: Workqueue: btrfs-endio btrfs_work_helper [btrfs]
kernel: RIP: 0010:lzo_decompress_bio (./include/linux/fortify-string.h:225 fs/btrfs/lzo.c:322 fs/btrfs/lzo.c:394) btrfs
Code starting with the faulting instruction
===========================================
0:* 48 8b 06 mov (%rsi),%rax
<-- trapping instruction

   3:   48 8d 79 08             lea    0x8(%rcx),%rdi
   7:   48 83 e7 f8             and    $0xfffffffffffffff8,%rdi
   b:   48 89 01                mov    %rax,(%rcx)
   e:   44 89 f0                mov    %r14d,%eax
  11:   48 8b 54 06 f8          mov    -0x8(%rsi,%rax,1),%rdx

kernel: RSP: 0018:ffffb110812efd50 EFLAGS: 00010212
kernel: RAX: 0000000000001000 RBX: 000000009ca264c8 RCX:
ffff98996e6d8ff8
kernel: RDX: 0000000000000064 RSI: 000841551d5c1000 RDI:
ffffffff9500435d
kernel: RBP: ffff989a3be856c0 R08: 0000000000000000 R09:
0000000000000000
kernel: R10: 0000000000000000 R11: 0000000000001000 R12:
ffff98996e6d8000
kernel: R13: 0000000000000008 R14: 0000000000001000 R15:
000841551d5c1000
kernel: FS: 0000000000000000(0000) GS:ffff98a09d640000(0000) knlGS:0000000000000000
kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
kernel: CR2: 00001e9f984d9ea8 CR3: 000000014971a000 CR4:
00000000003506e0
kernel: Call Trace:
kernel: <TASK>
kernel: end_compressed_bio_read (fs/btrfs/compression.c:104 fs/btrfs/compression.c:1363 fs/btrfs/compression.c:323) btrfs
kernel: end_workqueue_fn (fs/btrfs/disk-io.c:1923) btrfs
kernel: btrfs_work_helper (fs/btrfs/async-thread.c:326) btrfs
kernel: process_one_work (./arch/x86/include/asm/jump_label.h:27 ./include/linux/jump_label.h:212 ./include/trace/events/workqueue.h:108 kernel/workqueue.c:2312)
kernel: worker_thread (./include/linux/list.h:292 kernel/workqueue.c:2455)
kernel: ? process_one_work (kernel/workqueue.c:2397)
kernel: kthread (kernel/kthread.c:377)
kernel: ? kthread_complete_and_exit (kernel/kthread.c:332)
kernel: ret_from_fork (arch/x86/entry/entry_64.S:301)
kernel: </TASK>

---
 fs/btrfs/lzo.c | 7 +++++++
 1 file changed, 7 insertions(+)
fs/btrfs/lzo.c +0 -0
index 31319dfcc9fb..ebaa5083f2ae 100644
@@ -383,6 +383,13 @@ int lzo_decompress_bio(struct list_head
 *ws, struct compressed_bio *cb)
              kunmap(cur_page);
              cur_in += LZO_LEN;
 
Quoted 10 lines
Quoted 4 lines
fs/btrfs/lzo.c +2 -0
+             if (seg_len > WORKSPACE_CBUF_LENGTH) {
+                     // seg_len shouldn't be larger than we

have allocated for workspace->cbuf

Makes sense.
Is the corrupted lzo compressed extent produced by a normal fs or crafted manually? If it is from a normal fs, something insane happened
in extent compressed path.

Happened normally, but in 2016 year. It's RAID1 where HBA dropped out some disks and some sectors didn't got written, so most likely that section contains previous unrelated data.

#4 lore raw

Re: [PATCH 2/2] btrfs: prevent copying too big compressed lzo segment

In reply to Dāvis Mosāns
Quoted 52 lines · Dāvis Mosāns

Compressed length can be corrupted to be a lot larger than memory we have allocated for buffer.
This will cause memcpy in copy_compressed_segment to write outside of allocated memory.

This mostly results in stuck read syscall but sometimes when using btrfs send can get #GP

kernel: general protection fault, probably for non-canonical address 0x841551d5c1000: 0000 [#1] PREEMPT SMP NOPTI
kernel: CPU: 17 PID: 264 Comm: kworker/u256:7 Tainted: P OE 5.17.0-rc2-1 #12
kernel: Workqueue: btrfs-endio btrfs_work_helper [btrfs]
kernel: RIP: 0010:lzo_decompress_bio (./include/linux/fortify-string.h:225 fs/btrfs/lzo.c:322 fs/btrfs/lzo.c:394) btrfs Code starting with the faulting instruction
===========================================

   0:*  48 8b 06                mov    (%rsi),%rax              <-- trapping instruction
   3:   48 8d 79 08             lea    0x8(%rcx),%rdi
   7:   48 83 e7 f8             and    $0xfffffffffffffff8,%rdi
   b:   48 89 01                mov    %rax,(%rcx)
   e:   44 89 f0                mov    %r14d,%eax
  11:   48 8b 54 06 f8          mov    -0x8(%rsi,%rax,1),%rdx
kernel: RSP: 0018:ffffb110812efd50 EFLAGS: 00010212
kernel: RAX: 0000000000001000 RBX: 000000009ca264c8 RCX: ffff98996e6d8ff8
kernel: RDX: 0000000000000064 RSI: 000841551d5c1000 RDI: ffffffff9500435d
kernel: RBP: ffff989a3be856c0 R08: 0000000000000000 R09: 0000000000000000
kernel: R10: 0000000000000000 R11: 0000000000001000 R12: ffff98996e6d8000
kernel: R13: 0000000000000008 R14: 0000000000001000 R15: 000841551d5c1000
kernel: FS:  0000000000000000(0000) GS:ffff98a09d640000(0000) knlGS:0000000000000000
kernel: CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
kernel: CR2: 00001e9f984d9ea8 CR3: 000000014971a000 CR4: 00000000003506e0
kernel: Call Trace:
kernel:  <TASK>
kernel: end_compressed_bio_read (fs/btrfs/compression.c:104 fs/btrfs/compression.c:1363 fs/btrfs/compression.c:323) btrfs
kernel: end_workqueue_fn (fs/btrfs/disk-io.c:1923) btrfs
kernel: btrfs_work_helper (fs/btrfs/async-thread.c:326) btrfs
kernel: process_one_work (./arch/x86/include/asm/jump_label.h:27 ./include/linux/jump_label.h:212 ./include/trace/events/workqueue.h:108 kernel/workqueue.c:2312)
kernel: worker_thread (./include/linux/list.h:292 kernel/workqueue.c:2455)
kernel: ? process_one_work (kernel/workqueue.c:2397)
kernel: kthread (kernel/kthread.c:377)
kernel: ? kthread_complete_and_exit (kernel/kthread.c:332)
kernel: ret_from_fork (arch/x86/entry/entry_64.S:301)
kernel:  </TASK>
---
 fs/btrfs/lzo.c | 7 +++++++
 1 file changed, 7 insertions(+)
fs/btrfs/lzo.c +0 -0
index 31319dfcc9fb..ebaa5083f2ae 100644

fs/btrfs/lzo.c int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb) · line 392

Quoted 10 lines
fs/btrfs/lzo.c +7 -0
@@ -383,6 +383,13 @@ int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb)
 		kunmap(cur_page);
 		cur_in += LZO_LEN;
 
+		if (seg_len > WORKSPACE_CBUF_LENGTH) {
+			// seg_len shouldn't be larger than we have allocated for workspace->cbuf
+			btrfs_err(fs_info, "unexpectedly large lzo segment len %u", seg_len);
+			ret = -EUCLEAN;
+			goto out;
+		}
+

Oof, the fact that we weren't checking this is pretty bad... Shouldn't we also be checking that seg_len is within the size of the remaining input?

Quoted 6 lines
fs/btrfs/lzo.c +0 -0
 		/* Copy the compressed segment payload into workspace */
 		copy_compressed_segment(cb, workspace->cbuf, seg_len, &cur_in);
 
Signature · 1 line
2.35.1
#5 lore raw

Re: [PATCH 2/2] btrfs: prevent copying too big compressed lzo segment

piektd., 2022. g. 4. febr., plkst. 02:48 — lietotājs Omar Sandoval (<[email protected]>) rakstīja:

Quoted 57 lines · Dāvis Mosāns
Quoted 55 lines

Compressed length can be corrupted to be a lot larger than memory we have allocated for buffer.
This will cause memcpy in copy_compressed_segment to write outside of allocated memory.

This mostly results in stuck read syscall but sometimes when using btrfs send can get #GP

kernel: general protection fault, probably for non-canonical address 0x841551d5c1000: 0000 [#1] PREEMPT SMP NOPTI
kernel: CPU: 17 PID: 264 Comm: kworker/u256:7 Tainted: P OE 5.17.0-rc2-1 #12
kernel: Workqueue: btrfs-endio btrfs_work_helper [btrfs]
kernel: RIP: 0010:lzo_decompress_bio (./include/linux/fortify-string.h:225 fs/btrfs/lzo.c:322 fs/btrfs/lzo.c:394) btrfs Code starting with the faulting instruction
===========================================

   0:*  48 8b 06                mov    (%rsi),%rax              <-- trapping instruction
   3:   48 8d 79 08             lea    0x8(%rcx),%rdi
   7:   48 83 e7 f8             and    $0xfffffffffffffff8,%rdi
   b:   48 89 01                mov    %rax,(%rcx)
   e:   44 89 f0                mov    %r14d,%eax
  11:   48 8b 54 06 f8          mov    -0x8(%rsi,%rax,1),%rdx
kernel: RSP: 0018:ffffb110812efd50 EFLAGS: 00010212
kernel: RAX: 0000000000001000 RBX: 000000009ca264c8 RCX: ffff98996e6d8ff8
kernel: RDX: 0000000000000064 RSI: 000841551d5c1000 RDI: ffffffff9500435d
kernel: RBP: ffff989a3be856c0 R08: 0000000000000000 R09: 0000000000000000
kernel: R10: 0000000000000000 R11: 0000000000001000 R12: ffff98996e6d8000
kernel: R13: 0000000000000008 R14: 0000000000001000 R15: 000841551d5c1000
kernel: FS:  0000000000000000(0000) GS:ffff98a09d640000(0000) knlGS:0000000000000000
kernel: CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
kernel: CR2: 00001e9f984d9ea8 CR3: 000000014971a000 CR4: 00000000003506e0
kernel: Call Trace:
kernel:  <TASK>
kernel: end_compressed_bio_read (fs/btrfs/compression.c:104 fs/btrfs/compression.c:1363 fs/btrfs/compression.c:323) btrfs
kernel: end_workqueue_fn (fs/btrfs/disk-io.c:1923) btrfs
kernel: btrfs_work_helper (fs/btrfs/async-thread.c:326) btrfs
kernel: process_one_work (./arch/x86/include/asm/jump_label.h:27 ./include/linux/jump_label.h:212 ./include/trace/events/workqueue.h:108 kernel/workqueue.c:2312)
kernel: worker_thread (./include/linux/list.h:292 kernel/workqueue.c:2455)
kernel: ? process_one_work (kernel/workqueue.c:2397)
kernel: kthread (kernel/kthread.c:377)
kernel: ? kthread_complete_and_exit (kernel/kthread.c:332)
kernel: ret_from_fork (arch/x86/entry/entry_64.S:301)
kernel:  </TASK>
---
 fs/btrfs/lzo.c | 7 +++++++
 1 file changed, 7 insertions(+)
fs/btrfs/lzo.c +0 -0
index 31319dfcc9fb..ebaa5083f2ae 100644
@@ -383,6 +383,13 @@ int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb)
              kunmap(cur_page);
              cur_in += LZO_LEN;
 
Quoted 12 lines

fs/btrfs/lzo.c int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb) · line 392

Quoted 7 lines
fs/btrfs/lzo.c +7 -0
+             if (seg_len > WORKSPACE_CBUF_LENGTH) {
+                     // seg_len shouldn't be larger than we have allocated for workspace->cbuf
+                     btrfs_err(fs_info, "unexpectedly large lzo segment len %u", seg_len);
+                     ret = -EUCLEAN;
+                     goto out;
+             }
+

Oof, the fact that we weren't checking this is pretty bad... Shouldn't we also be checking that seg_len is within the size of the remaining input?

I don't think that's useful. The only case where it matters is if final segment size is wrong and is larger than total size. In that case decompressing most likely will still succeed as it won't need all data to complete and it's safe to copy more than is used. It's more likely that middle segments are corrupted for which this check would make no difference.
But there still is another potential issue, if total size is correct, but if a lot segment sizes are corrupted to be smaller than supposed and if they still successfully decompress then we will read outside of cb->compressed_pages because we check only cur_in < len_in but not nr_pages

#6 lore raw

Re: [PATCH 2/2] btrfs: prevent copying too big compressed lzo segment

In reply to Dāvis Mosāns
Quoted 42 lines · Dāvis Mosāns

Compressed length can be corrupted to be a lot larger than memory we have allocated for buffer.
This will cause memcpy in copy_compressed_segment to write outside of allocated memory.

This mostly results in stuck read syscall but sometimes when using btrfs send can get #GP

kernel: general protection fault, probably for non-canonical address 0x841551d5c1000: 0000 [#1] PREEMPT SMP NOPTI
kernel: CPU: 17 PID: 264 Comm: kworker/u256:7 Tainted: P OE 5.17.0-rc2-1 #12
kernel: Workqueue: btrfs-endio btrfs_work_helper [btrfs]
kernel: RIP: 0010:lzo_decompress_bio (./include/linux/fortify-string.h:225 fs/btrfs/lzo.c:322 fs/btrfs/lzo.c:394) btrfs Code starting with the faulting instruction
===========================================

   0:*  48 8b 06                mov    (%rsi),%rax              <-- trapping instruction
   3:   48 8d 79 08             lea    0x8(%rcx),%rdi
   7:   48 83 e7 f8             and    $0xfffffffffffffff8,%rdi
   b:   48 89 01                mov    %rax,(%rcx)
   e:   44 89 f0                mov    %r14d,%eax
  11:   48 8b 54 06 f8          mov    -0x8(%rsi,%rax,1),%rdx
kernel: RSP: 0018:ffffb110812efd50 EFLAGS: 00010212
kernel: RAX: 0000000000001000 RBX: 000000009ca264c8 RCX: ffff98996e6d8ff8
kernel: RDX: 0000000000000064 RSI: 000841551d5c1000 RDI: ffffffff9500435d
kernel: RBP: ffff989a3be856c0 R08: 0000000000000000 R09: 0000000000000000
kernel: R10: 0000000000000000 R11: 0000000000001000 R12: ffff98996e6d8000
kernel: R13: 0000000000000008 R14: 0000000000001000 R15: 000841551d5c1000
kernel: FS:  0000000000000000(0000) GS:ffff98a09d640000(0000) knlGS:0000000000000000
kernel: CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
kernel: CR2: 00001e9f984d9ea8 CR3: 000000014971a000 CR4: 00000000003506e0
kernel: Call Trace:
kernel:  <TASK>
kernel: end_compressed_bio_read (fs/btrfs/compression.c:104 fs/btrfs/compression.c:1363 fs/btrfs/compression.c:323) btrfs
kernel: end_workqueue_fn (fs/btrfs/disk-io.c:1923) btrfs
kernel: btrfs_work_helper (fs/btrfs/async-thread.c:326) btrfs
kernel: process_one_work (./arch/x86/include/asm/jump_label.h:27 ./include/linux/jump_label.h:212 ./include/trace/events/workqueue.h:108 kernel/workqueue.c:2312)
kernel: worker_thread (./include/linux/list.h:292 kernel/workqueue.c:2455)
kernel: ? process_one_work (kernel/workqueue.c:2397)
kernel: kthread (kernel/kthread.c:377)
kernel: ? kthread_complete_and_exit (kernel/kthread.c:332)
kernel: ret_from_fork (arch/x86/entry/entry_64.S:301)
kernel:  </TASK>
Quoted 1 line

Thanks, added to misc-next. I've swapped the order of the patches so that it's easier to backport the fix.