|
 |
05bba0 |
From 46415e245ed90b1bb08ff4d67559a6c0f34cf9db Mon Sep 17 00:00:00 2001
|
|
|
05bba0 |
From: Jeffrey Cody <jcody@redhat.com>
|
|
|
05bba0 |
Date: Wed, 29 Jul 2015 16:59:53 +0200
|
|
|
05bba0 |
Subject: [PATCH 02/13] vpc: Handle failure for potentially large allocations
|
|
|
05bba0 |
|
|
|
05bba0 |
Message-id: <e1f23ed0869898acec75825bec74cf375bee876b.1438188988.git.jcody@redhat.com>
|
|
|
05bba0 |
Patchwork-id: 67196
|
|
|
05bba0 |
O-Subject: [RHEL-7.2 qemu-kvm PATCH 1/3] vpc: Handle failure for potentially large allocations
|
|
|
05bba0 |
Bugzilla: 1217349
|
|
|
05bba0 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
05bba0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
05bba0 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
05bba0 |
|
|
|
05bba0 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
05bba0 |
|
|
|
05bba0 |
Some code in the block layer makes potentially huge allocations. Failure
|
|
|
05bba0 |
is not completely unexpected there, so avoid aborting qemu and handle
|
|
|
05bba0 |
out-of-memory situations gracefully.
|
|
|
05bba0 |
|
|
|
05bba0 |
This patch addresses the allocations in the vpc block driver.
|
|
|
05bba0 |
|
|
|
05bba0 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
05bba0 |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
05bba0 |
Reviewed-by: Benoit Canet <benoit@irqsave.net>
|
|
|
05bba0 |
(cherry picked from commit 5fb09cd5867aabf26d5b85b0913dccd496b71421)
|
|
|
05bba0 |
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
|
|
05bba0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
05bba0 |
---
|
|
|
05bba0 |
block/vpc.c | 6 +++++-
|
|
|
05bba0 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
05bba0 |
|
|
|
05bba0 |
diff --git a/block/vpc.c b/block/vpc.c
|
|
|
05bba0 |
index 849501a..6fdce40 100644
|
|
|
05bba0 |
--- a/block/vpc.c
|
|
|
05bba0 |
+++ b/block/vpc.c
|
|
|
05bba0 |
@@ -260,7 +260,11 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,
|
|
|
05bba0 |
goto fail;
|
|
|
05bba0 |
}
|
|
|
05bba0 |
|
|
|
05bba0 |
- s->pagetable = qemu_blockalign(bs, s->max_table_entries * 4);
|
|
|
05bba0 |
+ s->pagetable = qemu_try_blockalign(bs->file, s->max_table_entries * 4);
|
|
|
05bba0 |
+ if (s->pagetable == NULL) {
|
|
|
05bba0 |
+ ret = -ENOMEM;
|
|
|
05bba0 |
+ goto fail;
|
|
|
05bba0 |
+ }
|
|
|
05bba0 |
|
|
|
05bba0 |
s->bat_offset = be64_to_cpu(dyndisk_header->table_offset);
|
|
|
05bba0 |
|
|
|
05bba0 |
--
|
|
|
05bba0 |
1.8.3.1
|
|
|
05bba0 |
|