diff options
| author | Nikola Pajkovsky <npajkovs@redhat.com> | 2012-08-15 02:38:08 +0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2014-02-11 01:11:33 +0400 |
| commit | 000e338c2808b8f416df36f43074a46eebdffff0 (patch) | |
| tree | 48c09db70c77f3cdc34f16c209178d97aeb9b7b6 | |
| parent | b8c528e117de6c2250ffa550c05504b4580f4210 (diff) | |
| download | linux-000e338c2808b8f416df36f43074a46eebdffff0.tar.xz | |
udf: fix retun value on error path in udf_load_logicalvol
commit 68766a2edcd5cd744262a70a2f67a320ac944760 upstream.
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>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -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 5ece6d6721f8..325d4d6856b1 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -1314,6 +1314,7 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block, "error loading logical volume descriptor: " "Partition table too long (%u > %lu)\n", table_len, sb->s_blocksize - sizeof(*lvd)); + ret = 1; goto out_bh; } @@ -1360,8 +1361,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))) { |