diff mbox

bochs: Fix memory leak in bochs_open() error path

Message ID 1397035209-14086-1-git-send-email-kwolf@redhat.com
State New
Headers show

Commit Message

Kevin Wolf April 9, 2014, 9:20 a.m. UTC 
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/bochs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Laszlo Ersek April 9, 2014, 10:27 a.m. UTC | #1 
On 04/09/14 11:20, Kevin Wolf wrote:
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  block/bochs.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/block/bochs.c b/block/bochs.c
> index 826ec12..50b84a9 100644
> --- a/block/bochs.c
> +++ b/block/bochs.c
> @@ -150,11 +150,13 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
>      s->extent_size = le32_to_cpu(bochs.extent);
>      if (s->extent_size == 0) {
>          error_setg(errp, "Extent size may not be zero");
> -        return -EINVAL;
> +        ret = -EINVAL;
> +        goto fail;
>      } else if (s->extent_size > 0x800000) {
>          error_setg(errp, "Extent size %" PRIu32 " is too large",
>                     s->extent_size);
> -        return -EINVAL;
> +        ret = -EINVAL;
> +        goto fail;
>      }
>  
>      if (s->catalog_size < bs->total_sectors / s->extent_size) {
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>
diff mbox

Patch

diff --git a/block/bochs.c b/block/bochs.c
index 826ec12..50b84a9 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -150,11 +150,13 @@  static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
     s->extent_size = le32_to_cpu(bochs.extent);
     if (s->extent_size == 0) {
         error_setg(errp, "Extent size may not be zero");
-        return -EINVAL;
+        ret = -EINVAL;
+        goto fail;
     } else if (s->extent_size > 0x800000) {
         error_setg(errp, "Extent size %" PRIu32 " is too large",
                    s->extent_size);
-        return -EINVAL;
+        ret = -EINVAL;
+        goto fail;
     }
 
     if (s->catalog_size < bs->total_sectors / s->extent_size) {