diff options
| author | Nikola Pajkovsky <npajkovs@redhat.com> | 2012-08-15 02:38:08 +0400 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2012-08-15 16:23:23 +0400 |
| commit | 68766a2edcd5cd744262a70a2f67a320ac944760 (patch) | |
| tree | 3d70e21ee8b354f9ab928d7e3c460891041cbac4 | |
| parent | 2e84f2641ea91a730642ead558a4ee3bd52310c9 (diff) | |
| download | linux-68766a2edcd5cd744262a70a2f67a320ac944760.tar.xz | |
udf: fix retun value on error path in udf_load_logicalvol
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>
Signed-off-by: Jan Kara <jack@suse.cz>
| -rw-r--r-- | fs/udf/super.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 9f55f7981b7d..18fc038a438d 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))) { |