summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-11-11 20:25:27 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2022-11-11 20:25:27 +0100
commite2559b79127a92a36f907006fe89c137666fb3a5 (patch)
tree25a0cdcfe2cd5333f1f08a201cf0e45dcb96a5e2
parentMerge tag 'perf-tools-fixes-for-v6.1-2-2022-11-10' of git://git.kernel.org/pu... (diff)
parentudf: Fix a slab-out-of-bounds write bug in udf_find_entry() (diff)
downloadlinux-e2559b79127a92a36f907006fe89c137666fb3a5.tar.xz
linux-e2559b79127a92a36f907006fe89c137666fb3a5.zip
Merge tag 'fixes_for_v6.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull UDF fix from Jan Kara: "Fix a possible memory corruption with UDF" * tag 'fixes_for_v6.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: udf: Fix a slab-out-of-bounds write bug in udf_find_entry()
-rw-r--r--fs/udf/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index fb4c30e05245..ae7bc13a5298 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -240,7 +240,7 @@ static struct fileIdentDesc *udf_find_entry(struct inode *dir,
poffset - lfi);
else {
if (!copy_name) {
- copy_name = kmalloc(UDF_NAME_LEN,
+ copy_name = kmalloc(UDF_NAME_LEN_CS0,
GFP_NOFS);
if (!copy_name) {
fi = ERR_PTR(-ENOMEM);