* [PATCH] udf: fix retun value on error path in udf_load_logicalvol
@ 2012-08-14 22:38 Nikola Pajkovsky
2012-08-15 12:23 ` Jan Kara
0 siblings, 1 reply; 2+ messages in thread
From: Nikola Pajkovsky @ 2012-08-14 22:38 UTC (permalink / raw)
To: Jan Kara; +Cc: linux-kernel, Nikola Pajkovsky
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>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] udf: fix retun value on error path in udf_load_logicalvol
2012-08-14 22:38 [PATCH] udf: fix retun value on error path in udf_load_logicalvol Nikola Pajkovsky
@ 2012-08-15 12:23 ` Jan Kara
0 siblings, 0 replies; 2+ messages in thread
From: Jan Kara @ 2012-08-15 12:23 UTC (permalink / raw)
To: Nikola Pajkovsky; +Cc: Jan Kara, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-15 12:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-14 22:38 [PATCH] udf: fix retun value on error path in udf_load_logicalvol Nikola Pajkovsky
2012-08-15 12:23 ` Jan Kara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).