projects/linux·commit a6db2a5d

Merge tag 'ubifs-for-linus-6.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs

a6db2a5d · Linus Torvalds <[email protected]> · 2024-12-07 09:57:38 -08:00

Pull jffs2 fix from Richard Weinberger:

 - Fixup rtime compressor bounds checking

* tag 'ubifs-for-linus-6.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
  jffs2: Fix rtime decompressor
Commit
a6db2a5d7df3e577c268ba7955eb48e913424599
Parents
b5f21708 · b29bf711

Merge commit. Changes below are compared with the first parent: b5f21708.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
fs/jffs2/compr_rtime.cmodified+1−1View file

fs/jffs2/compr_rtime.c

View file
diff --git a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c
index 2b9ef71..3bd9d2f 100644
--- a/fs/jffs2/compr_rtime.c
+++ b/fs/jffs2/compr_rtime.c
@@ -95,7 +95,7 @@ static int jffs2_rtime_decompress(unsigned char *data_in,
positions[value]=outpos;
if (repeat) {
- if ((outpos + repeat) >= destlen) {
+ if ((outpos + repeat) > destlen) {
return 1;
}
if (backoffs + repeat >= outpos) {