From: Dan Carpenter <dan.carpenter@oracle.com>
To: Jan Kara <jack@suse.cz>, Fabian Frederick <fabf@skynet.be>
Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] udf: fix udf_load_pvoldesc()
Date: Wed, 20 May 2015 11:13:15 +0300 [thread overview]
Message-ID: <20150520081315.GA21948@mwanda> (raw)
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>
diff --git a/fs/udf/super.c b/fs/udf/super.c
index c6a8f5f..b96f190 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:
next reply other threads:[~2015-05-20 8:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-20 8:13 Dan Carpenter [this message]
2015-05-21 13:21 ` [patch] udf: fix udf_load_pvoldesc() Jan Kara
2015-05-21 15:04 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150520081315.GA21948@mwanda \
--to=dan.carpenter@oracle.com \
--cc=fabf@skynet.be \
--cc=jack@suse.cz \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox