Merge tag 'fs_for_v6.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

torvalds · torvalds · commit 065d49851e1a · 2025-04-15T08:19:52.000-07:00
Pull isofs fix from Jan Kara:
 "Fix a case where isofs could be reading beyond end of the passed
  file handle if its type was incorrectly set"

* tag 'fs_for_v6.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  isofs: Prevent the use of too small fid
diff --git a/fs/isofs/export.c b/fs/isofs/export.c
@@ -180,7 +180,7 @@ static struct dentry *isofs_fh_to_parent(struct super_block *sb,
 		return NULL;
 
 	return isofs_export_iget(sb,
-			fh_len > 2 ? ifid->parent_block : 0,
+			fh_len > 3 ? ifid->parent_block : 0,
 			ifid->parent_offset,
 			fh_len > 4 ? ifid->parent_generation : 0);
 }

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ static struct dentry isofs_fh_to_parent(struct super_block sb,`
`180`	`180`	`return NULL;`
`181`	`181`
`182`	`182`	`return isofs_export_iget(sb,`
`183`		`- fh_len > 2 ? ifid->parent_block : 0,`
	`183`	`+ fh_len > 3 ? ifid->parent_block : 0,`
`184`	`184`	`ifid->parent_offset,`
`185`	`185`	`fh_len > 4 ? ifid->parent_generation : 0);`
`186`	`186`	`}`