Commit 065d4985 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 834a4a68 0405d4b6

fs/isofs/export.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}