summary refs log tree commit diff
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2023-06-21 11:32:35 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-07-27 08:50:32 +0200
commita6824149809395dfbb5bc36bc7057cc3cb84e56d (patch)
treed0665cc0120433bdd444bed1e5f8ccdf075ee1e5 /fs
parentcce9107c315f564784f18fab18d2c20ab888d262 (diff)
downloadlinux-a6824149809395dfbb5bc36bc7057cc3cb84e56d.tar.gz
udf: Fix uninitialized array access for some pathnames
[ Upstream commit 028f6055c912588e6f72722d89c30b401bbcf013 ]

For filenames that begin with . and are between 2 and 5 characters long,
UDF charset conversion code would read uninitialized memory in the
output buffer. The only practical impact is that the name may be prepended a
"unification hash" when it is not actually needed but still it is good
to fix this.

Reported-by: syzbot+cd311b1e43cc25f90d18@syzkaller.appspotmail.com
Link: https://lore.kernel.org/all/000000000000e2638a05fe9dc8f9@google.com
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/udf/unicode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
index 622569007b53..2142cbd1dde2 100644
--- a/fs/udf/unicode.c
+++ b/fs/udf/unicode.c
@@ -247,7 +247,7 @@ static int udf_name_from_CS0(struct super_block *sb,
 	}
 
 	if (translate) {
-		if (str_o_len <= 2 && str_o[0] == '.' &&
+		if (str_o_len > 0 && str_o_len <= 2 && str_o[0] == '.' &&
 		    (str_o_len == 1 || str_o[1] == '.'))
 			needsCRC = 1;
 		if (needsCRC) {