summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-04-15 08:19:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2025-04-15 08:19:52 -0700
commit065d49851e1a345faf112f12f96272e37ccd58ad (patch)
tree4368fa35b919c1b90e7283339b0e81660a112561
parent834a4a689699090a406d1662b03affa8b155d025 (diff)
parent0405d4b63d082861f4eaff9d39c78ee9dc34f845 (diff)
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
-rw-r--r--fs/isofs/export.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/isofs/export.c b/fs/isofs/export.c
index 35768a63fb1d..421d247fae52 100644
--- 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);
}