| Message ID | 1400689698-3096-20-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Wed, May 21, 2014 at 06:28:17PM +0200, Kevin Wolf wrote: > Some code in the block layer makes potentially huge allocations. Failure > is not completely unexpected there, so avoid aborting qemu and handle > out-of-memory situations gracefully. > > This patch addresses the allocations in the vpc block driver. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > block/vpc.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/block/vpc.c b/block/vpc.c index 2e25f57..a6346bb 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -269,7 +269,11 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - s->pagetable = qemu_blockalign(bs, s->max_table_entries * 4); + s->pagetable = qemu_try_blockalign(bs, s->max_table_entries * 4); + if (s->pagetable == NULL) { + ret = -ENOMEM; + goto fail; + } s->bat_offset = be64_to_cpu(dyndisk_header->table_offset);
Some code in the block layer makes potentially huge allocations. Failure is not completely unexpected there, so avoid aborting qemu and handle out-of-memory situations gracefully. This patch addresses the allocations in the vpc block driver. Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- block/vpc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)