| From 219fcc0ee714692fc67eb9e9d0d2e12c556ad0c2 Mon Sep 17 00:00:00 2001 |
| From: Nikola Pajkovsky <npajkovs@redhat.com> |
| Date: Wed, 15 Aug 2012 00:38:08 +0200 |
| Subject: [PATCH] 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> |
| --- |
| 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 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))) { |
| -- |
| 1.8.5.2 |
| |
