From: Dan Carpenter Date: Wed, 20 May 2015 08:13:15 +0000 (+0300) Subject: udf: fix udf_load_pvoldesc() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=792352cb160e654f0b64182550ee702a790fe4d0;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git udf: fix udf_load_pvoldesc() There are some missing braces here which means this function never succeeds. Fixes: e9d4cf411f75 ('udf: improve error management in udf_CS0toUTF8()') Signed-off-by: Dan Carpenter Signed-off-by: Jan Kara --- diff --git a/fs/udf/super.c b/fs/udf/super.c index c6a8f5f79443..b96f190bc567 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -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); } - if (!udf_build_ustr(instr, pvoldesc->volSetIdent, 128)) + if (!udf_build_ustr(instr, pvoldesc->volSetIdent, 128)) { ret = udf_CS0toUTF8(outstr, instr); if (ret < 0) goto out_bh; udf_debug("volSetIdent[] = '%s'\n", outstr->u_name); + } ret = 0; out_bh: