proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 09:37:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lvm: remove stack allocations

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2019-02-05 07:39:51 +01:00
parent 6b4e204c7b
commit 007bb915d5
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lxc/storage/lvm.c
View File

@ -37,6 +37,7 @@
#include "config.h" #include "config.h"
#include "log.h" #include "log.h"
#include "lvm.h" #include "lvm.h"
#include "memory_utils.h"
#include "rsync.h" #include "rsync.h"
#include "storage.h" #include "storage.h"
#include "storage_utils.h" #include "storage_utils.h"
@ -113,7 +114,7 @@ static int do_lvm_create(const char *path, uint64_t size, const char *thinpool)
char *pathdup, *vg, *lv; char *pathdup, *vg, *lv;
char cmd_output[PATH_MAX]; char cmd_output[PATH_MAX];
char sz[24]; char sz[24];
char *tp = NULL; __do_free char *tp;
struct lvcreate_args cmd_args = {0}; struct lvcreate_args cmd_args = {0};
ret = snprintf(sz, 24, "%" PRIu64 "b", size); ret = snprintf(sz, 24, "%" PRIu64 "b", size);
@ -149,7 +150,7 @@ static int do_lvm_create(const char *path, uint64_t size, const char *thinpool)
if (thinpool) { if (thinpool) {
len = strlen(pathdup) + strlen(thinpool) + 2; len = strlen(pathdup) + strlen(thinpool) + 2;
tp = alloca(len); tp = must_realloc(NULL, len);
ret = snprintf(tp, len, "%s/%s", pathdup, thinpool); ret = snprintf(tp, len, "%s/%s", pathdup, thinpool);
if (ret < 0 || ret >= len) { if (ret < 0 || ret >= len) {
@ -267,15 +268,15 @@ int lvm_umount(struct lxc_storage *bdev)
#define __LVSCMD "lvs --unbuffered --noheadings -o lv_attr %s 2>/dev/null" #define __LVSCMD "lvs --unbuffered --noheadings -o lv_attr %s 2>/dev/null"
int lvm_compare_lv_attr(const char *path, int pos, const char expected) int lvm_compare_lv_attr(const char *path, int pos, const char expected)
{ {
__do_free char *cmd;
struct lxc_popen_FILE *f; struct lxc_popen_FILE *f;
int ret, status; int ret, status;
size_t len; size_t len;
char *cmd;
char output[12]; char output[12];
int start = 0; int start = 0;
len = strlen(__LVSCMD) + strlen(path) + 1; len = strlen(__LVSCMD) + strlen(path) + 1;
cmd = alloca(len); cmd = must_realloc(NULL, len);
ret = snprintf(cmd, len, __LVSCMD, path); ret = snprintf(cmd, len, __LVSCMD, path);
if (ret < 0 || (size_t)ret >= len) if (ret < 0 || (size_t)ret >= len)