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

torvalds · torvalds · commit a6db2a5d7df3 · 2024-12-07T09:57:38.000-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
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ static int jffs2_rtime_decompress(unsigned char *data_in,`
`95`	`95`
`96`	`96`	`positions[value]=outpos;`
`97`	`97`	`if (repeat) {`
`98`		`- if ((outpos + repeat) >= destlen) {`
	`98`	`+ if ((outpos + repeat) > destlen) {`
`99`	`99`	`return 1;`
`100`	`100`	`}`
`101`	`101`	`if (backoffs + repeat >= outpos) {`