file-posix: Fix leaked fd in raw_open_common() error path

kevmw · kevmw · commit a8c5cf27c945 · 2020-07-17T14:20:57.000+02:00
Signed-off-by: Kevin Wolf &lt;kwolf@redhat.com&gt;
Message-Id: &lt;20200717105426.51134-4-kwolf@redhat.com&gt;
Reviewed-by: Max Reitz &lt;mreitz@redhat.com&gt;
Signed-off-by: Kevin Wolf &lt;kwolf@redhat.com&gt;
diff --git a/block/file-posix.c b/block/file-posix.c
@@ -773,6 +773,9 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
     }
     ret = 0;
 fail:
+    if (ret < 0 && s->fd != -1) {
+        qemu_close(s->fd);
+    }
     if (filename && (bdrv_flags & BDRV_O_TEMPORARY)) {
         unlink(filename);
     }

Original file line number	Diff line number	Diff line change
`@@ -773,6 +773,9 @@ static int raw_open_common(BlockDriverState bs, QDict options,`
`773`	`773`	`}`
`774`	`774`	`ret = 0;`
`775`	`775`	`fail:`
	`776`	`+ if (ret < 0 && s->fd != -1) {`
	`777`	`+ qemu_close(s->fd);`
	`778`	`+ }`
`776`	`779`	`if (filename && (bdrv_flags & BDRV_O_TEMPORARY)) {`
`777`	`780`	`unlink(filename);`
`778`	`781`	`}`