shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

libdm: convert FIEMAP buffer allocation from stack to dm_zalloc

Browse Source
This commit is contained in:
Bryn M. Reeves 2016-10-03 14:42:30 +01:00
parent 49a1c4d4b0
commit e95a252974
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libdm/libdm-stats.c
View File

@ -4195,9 +4195,9 @@ static int _stats_add_extent(struct dm_pool *mem, struct fiemap_extent *fm_ext,
static struct _extent *_stats_get_extents_for_file(struct dm_pool *mem, int fd, static struct _extent *_stats_get_extents_for_file(struct dm_pool *mem, int fd,
uint64_t *count) uint64_t *count)
{ {
uint64_t buf[STATS_FIE_BUF_LEN]; uint64_t *buf;
struct fiemap *fiemap = (struct fiemap *)buf; struct fiemap *fiemap = NULL;
struct fiemap_extent *fm_ext = &fiemap->fm_extents[0]; struct fiemap_extent *fm_ext = NULL;
struct fiemap_extent fm_last = {0}; struct fiemap_extent fm_last = {0};
struct _extent *extents; struct _extent *extents;
unsigned long long expected = 0; unsigned long long expected = 0;
@ -4208,10 +4208,18 @@ static struct _extent *_stats_get_extents_for_file(struct dm_pool *mem, int fd,
int last = 0; int last = 0;
int rc; int rc;
memset(buf, 0, sizeof(buf)); buf = dm_zalloc(STATS_FIE_BUF_LEN);
if (!buf) {
log_error("Could not allocate memory for FIEMAP buffer.");
return NULL;
}
/* initialise pointers into the ioctl buffer. */
fiemap = (struct fiemap *) buf;
fm_ext = &fiemap->fm_extents[0];
/* space available per ioctl */ /* space available per ioctl */
*count = (sizeof(buf) - sizeof(*fiemap)) *count = (STATS_FIE_BUF_LEN - sizeof(*fiemap))
/ sizeof(struct fiemap_extent); / sizeof(struct fiemap_extent);
/* grow temporary extent table in the pool */ /* grow temporary extent table in the pool */
@ -4277,9 +4285,16 @@ static struct _extent *_stats_get_extents_for_file(struct dm_pool *mem, int fd,
/* return total number of extents */ /* return total number of extents */
*count = tot_extents; *count = tot_extents;
return dm_pool_end_object(mem); extents = dm_pool_end_object(mem);
/* free FIEMAP buffer. */
dm_free(buf);
return extents;
bad: bad:
dm_pool_abandon_object(mem); dm_pool_abandon_object(mem);
dm_free(buf);
return NULL; return NULL;
} }