lkml.org 
[lkml]   [2012]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] udf: fix retun value on error path in udf_load_logicalvol
On Wed 15-08-12 00:38:08, Nikola Pajkovsky wrote:
> In case we detect a problem and bail out, we fail to set "ret" to a
> nonzero value, and udf_load_logicalvol will mistakenly report success.
>
> Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
Thanks. I've added the patch to my tree and will send it to Linus soon.

Honza

> ---
> fs/udf/super.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/fs/udf/super.c b/fs/udf/super.c
> index dcbf987..c96bd77 100644
> --- a/fs/udf/super.c
> +++ b/fs/udf/super.c
> @@ -1344,6 +1344,7 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block,
> udf_err(sb, "error loading logical volume descriptor: "
> "Partition table too long (%u > %lu)\n", table_len,
> sb->s_blocksize - sizeof(*lvd));
> + ret = 1;
> goto out_bh;
> }
>
> @@ -1388,8 +1389,10 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block,
> UDF_ID_SPARABLE,
> strlen(UDF_ID_SPARABLE))) {
> if (udf_load_sparable_map(sb, map,
> - (struct sparablePartitionMap *)gpm) < 0)
> + (struct sparablePartitionMap *)gpm) < 0) {
> + ret = 1;
> goto out_bh;
> + }
> } else if (!strncmp(upm2->partIdent.ident,
> UDF_ID_METADATA,
> strlen(UDF_ID_METADATA))) {
> --
> 1.7.10.2
>
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR


\
 
 \ /
  Last update: 2012-08-15 15:03    [W:0.031 / U:0.736 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site