From e72e8cc71f1a6359126055504e4043a33533c78f Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Wed, 22 Sep 2010 22:31:45 +0000 Subject: [PATCH] Replace alloca with dm_malloc in _aligned_io. (This section of code dates from 2.4 and could be written more efficiently nowadays.) --- WHATS_NEW | 1 + lib/device/dev-io.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 77ca105d5..4bbeb0a11 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.74 - ===================================== + Replace alloca with dm_malloc in _aligned_io. Fix partial mode operations for lvm1 metadata format. Track recursive filter iteration to avoid refreshing while in use. (2.02.56) Revert to old glibc vsnprintf behaviour in emit_to_buffer() to catch overflow. diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index 8c7cf38ce..f4d6648c5 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -164,10 +164,11 @@ static void _widen_region(unsigned int block_size, struct device_area *region, static int _aligned_io(struct device_area *where, void *buffer, int should_write) { - void *bounce; + void *bounce, *bounce_buf; unsigned int block_size = 0; uintptr_t mask; struct device_area widened; + int r = 0; if (!(where->dev->flags & DEV_REGULAR) && !_get_block_size(where->dev, &block_size)) @@ -185,8 +186,8 @@ static int _aligned_io(struct device_area *where, void *buffer, return _io(where, buffer, should_write); /* Allocate a bounce buffer with an extra block */ - if (!(bounce = alloca((size_t) widened.size + block_size))) { - log_error("Bounce buffer alloca failed"); + if (!(bounce_buf = bounce = dm_malloc((size_t) widened.size + block_size))) { + log_error("Bounce buffer malloc failed"); return 0; } @@ -199,7 +200,7 @@ static int _aligned_io(struct device_area *where, void *buffer, /* channel the io through the bounce buffer */ if (!_io(&widened, bounce, 0)) { if (!should_write) - return_0; + goto_out; /* FIXME pre-extend the file */ memset(bounce, '\n', widened.size); } @@ -209,13 +210,18 @@ static int _aligned_io(struct device_area *where, void *buffer, (size_t) where->size); /* ... then we write */ - return _io(&widened, bounce, 1); + r = _io(&widened, bounce, 1); + goto_out; } memcpy(buffer, bounce + (where->start - widened.start), (size_t) where->size); - return 1; + r = 1; + +out: + dm_free(bounce_buf); + return r; } static int _dev_get_size_file(const struct device *dev, uint64_t *size) -- 2.43.5