summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-05-20 11:13:15 +0300
committerJan Kara <jack@suse.cz>2015-05-21 15:19:15 +0200
commit792352cb160e654f0b64182550ee702a790fe4d0 (patch)
tree90d7b78c40b8d536185c335f6f9f325eaeab9e55
parent942d702e719607da308c00af1b63804bf88cb030 (diff)
downloadblackbird-op-linux-792352cb160e654f0b64182550ee702a790fe4d0.tar.gz
blackbird-op-linux-792352cb160e654f0b64182550ee702a790fe4d0.zip
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 <dan.carpenter@oracle.com> Signed-off-by: Jan Kara <jack@suse.cz>
-rw-r--r--fs/udf/super.c3
1 files changed, 2 insertions, 1 deletions
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:
OpenPOWER on IntegriCloud