Commit e2559b79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents eb037f16 c8af247d

fs/udf/namei.c

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