openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

udf: fix udf_load_pvoldesc() 

There are some missing braces here which means this function never
succeeds.

Fixes: e9d4cf411f ('udf: improve error management in udf_CS0toUTF8()')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Dan Carpenter 2015-05-20 11:13:15 +03:00 committed by Jan Kara
parent 942d702e71
commit 792352cb16
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/udf/super.c
View File

@ -937,12 +937,13 @@ static int udf_load_pvoldesc(struct super_block *sb, sector_t block)
udf_debug("volIdent[] = '%s'\n", UDF_SB(sb)->s_volume_ident); udf_debug("volIdent[] = '%s'\n", UDF_SB(sb)->s_volume_ident);
} }
if (!udf_build_ustr(instr, pvoldesc->volSetIdent, 128)) if (!udf_build_ustr(instr, pvoldesc->volSetIdent, 128)) {
ret = udf_CS0toUTF8(outstr, instr); ret = udf_CS0toUTF8(outstr, instr);
if (ret < 0) if (ret < 0)
goto out_bh; goto out_bh;
udf_debug("volSetIdent[] = '%s'\n", outstr->u_name); udf_debug("volSetIdent[] = '%s'\n", outstr->u_name);
}
ret = 0; ret = 0;
out_bh: out_bh: