[patch] udf: fix udf_load_pvoldesc()

[patch] udf: fix udf_load_pvoldesc()

[Dan Carpenter]

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:

Re: [patch] udf: fix udf_load_pvoldesc()

[Jan Kara]

On Wed 20-05-15 11:13:15, Dan Carpenter wrote:
> 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>
  Thanks for the patch. Added to my tree. Actually, the missing parenthesis
don't cause any real issues since almost all volumes have volIdent and thus
ret gets set to 0 in the previous if. But it's certainly good to fix.

								Honza

> 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:
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR

Re: [patch] udf: fix udf_load_pvoldesc()

[Dan Carpenter]

On Thu, May 21, 2015 at 03:21:56PM +0200, Jan Kara wrote:
> On Wed 20-05-15 11:13:15, Dan Carpenter wrote:
> > 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>
>   Thanks for the patch. Added to my tree. Actually, the missing parenthesis
> don't cause any real issues since almost all volumes have volIdent and thus
> ret gets set to 0 in the previous if. But it's certainly good to fix.

Ah...  I didn't read carefully.  Thanks.

regards,
dan carpenter