diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-07 09:57:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-07 09:57:38 -0800 |
| commit | a6db2a5d7df3e577c268ba7955eb48e913424599 (patch) | |
| tree | e8c378ccd3529994750654d01552c9bcc5ff1bfc | |
| parent | b5f217084ab3ddd4bdd03cd437f8e3b7e2d1f5b6 (diff) | |
| parent | b29bf7119d6bbfd04aabb8d82b060fe2a33ef890 (diff) | |
Merge tag 'ubifs-for-linus-6.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs
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
| -rw-r--r-- | fs/jffs2/compr_rtime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c index 2b9ef713b844..3bd9d2f3bece 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) { |