proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-14 19:09:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

loop: 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:38:02 +01:00
parent 2530ba9597
commit 6b4e204c7b
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/loop.c
View File

@ -39,6 +39,7 @@
#include "config.h" #include "config.h"
#include "log.h" #include "log.h"
#include "loop.h" #include "loop.h"
#include "memory_utils.h"
#include "storage.h" #include "storage.h"
#include "storage_utils.h" #include "storage_utils.h"
#include "utils.h" #include "utils.h"
@ -56,9 +57,9 @@ int loop_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
const char *lxcpath, int snap, uint64_t newsize, const char *lxcpath, int snap, uint64_t newsize,
struct lxc_conf *conf) struct lxc_conf *conf)
{ {
__do_free char *srcdev = NULL;
uint64_t size = newsize; uint64_t size = newsize;
int len, ret; int len, ret;
char *srcdev;
char fstype[100] = "ext4"; char fstype[100] = "ext4";
if (snap) { if (snap) {
@ -70,7 +71,7 @@ int loop_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
return -1; return -1;
len = strlen(lxcpath) + strlen(cname) + strlen("rootdev") + 3; len = strlen(lxcpath) + strlen(cname) + strlen("rootdev") + 3;
srcdev = alloca(len); srcdev = must_realloc(NULL, len);
ret = snprintf(srcdev, len, "%s/%s/rootdev", lxcpath, cname); ret = snprintf(srcdev, len, "%s/%s/rootdev", lxcpath, cname);
if (ret < 0 || ret >= len) { if (ret < 0 || ret >= len) {
ERROR("Failed to create string"); ERROR("Failed to create string");
@ -136,10 +137,10 @@ int loop_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
int loop_create(struct lxc_storage *bdev, const char *dest, const char *n, int loop_create(struct lxc_storage *bdev, const char *dest, const char *n,
struct bdev_specs *specs) struct bdev_specs *specs)
{ {
__do_free char *srcdev;
const char *fstype; const char *fstype;
uint64_t sz; uint64_t sz;
int ret, len; int ret, len;
char *srcdev;
if (!specs) if (!specs)
return -1; return -1;
@ -148,7 +149,7 @@ int loop_create(struct lxc_storage *bdev, const char *dest, const char *n,
* be <lxcpath>/<lxcname>/rootdev, and <src> will be "loop:<srcdev>". * be <lxcpath>/<lxcname>/rootdev, and <src> will be "loop:<srcdev>".
*/ */
len = strlen(dest) + 2; len = strlen(dest) + 2;
srcdev = alloca(len); srcdev = must_realloc(NULL, len);
ret = snprintf(srcdev, len, "%s", dest); ret = snprintf(srcdev, len, "%s", dest);
if (ret < 0 || ret >= len) { if (ret < 0 || ret >= len) {