diff mbox series

[04/21] parallels: return earler in fail_format branch in parallels_open()

Message ID 20230915184130.403366-6-den@openvz.org (mailing list archive)
State New, archived
Headers show
Series implement discard operation for Parallels images | expand

Commit Message

Denis V. Lunev Sept. 15, 2023, 6:41 p.m. UTC
We do not need to perform any deallocation/cleanup if wrong format is
detected.

Signed-off-by: Denis V. Lunev <den@openvz.org>
---
 block/parallels.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Alexander Ivanov Sept. 18, 2023, 8:14 a.m. UTC | #1
This is not the case with this patch, but it seems that the 5 first 
"goto fail;" could be
replaced by returns. The first allocation, freeing at the "fail" label, 
is at 1127 line.
The next error handling and all the previous ones can make return 
instead goto fail.

On 9/15/23 20:41, Denis V. Lunev wrote:
> We do not need to perform any deallocation/cleanup if wrong format is
> detected.
>
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> ---
>   block/parallels.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/block/parallels.c b/block/parallels.c
> index 1d5409f2ba..0f127427bf 100644
> --- a/block/parallels.c
> +++ b/block/parallels.c
> @@ -1226,7 +1226,8 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
>   
>   fail_format:
>       error_setg(errp, "Image not in Parallels format");
> -    ret = -EINVAL;
> +    return -EINVAL;
> +
>   fail:
>       /*
>        * "s" object was allocated by g_malloc0 so we can safely
Alexander Ivanov Sept. 18, 2023, 8:15 a.m. UTC | #2
On 9/15/23 20:41, Denis V. Lunev wrote:
> We do not need to perform any deallocation/cleanup if wrong format is
> detected.
>
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> ---
>   block/parallels.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/block/parallels.c b/block/parallels.c
> index 1d5409f2ba..0f127427bf 100644
> --- a/block/parallels.c
> +++ b/block/parallels.c
> @@ -1226,7 +1226,8 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
>   
>   fail_format:
>       error_setg(errp, "Image not in Parallels format");
> -    ret = -EINVAL;
> +    return -EINVAL;
> +
>   fail:
>       /*
>        * "s" object was allocated by g_malloc0 so we can safely
Reviewed-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
Alexander Ivanov Sept. 18, 2023, 8:16 a.m. UTC | #3
Oh, sorry, I see it in the next patch. =)

On 9/18/23 10:14, Alexander Ivanov wrote:
> This is not the case with this patch, but it seems that the 5 first 
> "goto fail;" could be
> replaced by returns. The first allocation, freeing at the "fail" 
> label, is at 1127 line.
> The next error handling and all the previous ones can make return 
> instead goto fail.
>
> On 9/15/23 20:41, Denis V. Lunev wrote:
>> We do not need to perform any deallocation/cleanup if wrong format is
>> detected.
>>
>> Signed-off-by: Denis V. Lunev <den@openvz.org>
>> ---
>>   block/parallels.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/block/parallels.c b/block/parallels.c
>> index 1d5409f2ba..0f127427bf 100644
>> --- a/block/parallels.c
>> +++ b/block/parallels.c
>> @@ -1226,7 +1226,8 @@ static int parallels_open(BlockDriverState *bs, 
>> QDict *options, int flags,
>>     fail_format:
>>       error_setg(errp, "Image not in Parallels format");
>> -    ret = -EINVAL;
>> +    return -EINVAL;
>> +
>>   fail:
>>       /*
>>        * "s" object was allocated by g_malloc0 so we can safely
>
Denis V. Lunev Sept. 18, 2023, 8:17 a.m. UTC | #4
On 9/18/23 10:14, Alexander Ivanov wrote:
> This is not the case with this patch, but it seems that the 5 first 
> "goto fail;" could be
> replaced by returns. The first allocation, freeing at the "fail" 
> label, is at 1127 line.
> The next error handling and all the previous ones can make return 
> instead goto fail.
>
> On 9/15/23 20:41, Denis V. Lunev wrote:
>> We do not need to perform any deallocation/cleanup if wrong format is
>> detected.
>>
>> Signed-off-by: Denis V. Lunev <den@openvz.org>
>> ---
>>   block/parallels.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/block/parallels.c b/block/parallels.c
>> index 1d5409f2ba..0f127427bf 100644
>> --- a/block/parallels.c
>> +++ b/block/parallels.c
>> @@ -1226,7 +1226,8 @@ static int parallels_open(BlockDriverState *bs, 
>> QDict *options, int flags,
>>     fail_format:
>>       error_setg(errp, "Image not in Parallels format");
>> -    ret = -EINVAL;
>> +    return -EINVAL;
>> +
>>   fail:
>>       /*
>>        * "s" object was allocated by g_malloc0 so we can safely
>
see next patch :-)
diff mbox series

Patch

diff --git a/block/parallels.c b/block/parallels.c
index 1d5409f2ba..0f127427bf 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -1226,7 +1226,8 @@  static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
 
 fail_format:
     error_setg(errp, "Image not in Parallels format");
-    ret = -EINVAL;
+    return -EINVAL;
+
 fail:
     /*
      * "s" object was allocated by g_malloc0 so we can safely