mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 14:44:12 +00:00
Code Issues Releases Wiki Activity

udf: Make udf_get_filename() return error instead of 0 length file name

Browse source 
Zero length file name isn't really valid. So check the length of the
final file name generated by udf_translate_to_linux() and return -EINVAL
instead of zero length file name. Update caller of udf_get_filename() to
not check for 0 return value.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Fabian Frederick 2015-04-08 21:23:57 +02:00 committed by Jan Kara
parent 5dce54b71e
commit 6ce6383673
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/udf/dir.c
View file

@ -168,7 +168,7 @@ static int udf_readdir(struct file *file, struct dir_context *ctx)
} }
flen = udf_get_filename(sb, nameptr, lfi, fname, UDF_NAME_LEN); flen = udf_get_filename(sb, nameptr, lfi, fname, UDF_NAME_LEN);
if (flen <= 0) if (flen < 0)
continue; continue;
tloc = lelb_to_cpu(cfi.icb.extLocation); tloc = lelb_to_cpu(cfi.icb.extLocation);

5
fs/udf/unicode.c
View file

@ -333,7 +333,7 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen,
uint8_t *dname, int dlen) uint8_t *dname, int dlen)
{ {
struct ustr *filename, *unifilename; struct ustr *filename, *unifilename;
int ret = 0; int ret;
if (!slen) if (!slen)
return -EIO; return -EIO;
@ -370,6 +370,9 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen,
ret = udf_translate_to_linux(dname, dlen, ret = udf_translate_to_linux(dname, dlen,
filename->u_name, filename->u_len, filename->u_name, filename->u_len,
unifilename->u_name, unifilename->u_len); unifilename->u_name, unifilename->u_len);
/* Zero length filename isn't valid... */
if (ret == 0)
ret = -EINVAL;
out2: out2:
kfree(unifilename); kfree(unifilename);
out1: out1: