proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 10:51:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxccontainer: non-functional changes

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-04-29 16:56:58 +02:00
parent 9640c6a767
commit 630ac7c61b
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/lxc/lxccontainer.c
View File

@ -1580,6 +1580,7 @@ static bool create_run_template(struct lxc_container *c, char *tpath,
static bool prepend_lxc_header(char *path, const char *t, char *const argv[]) static bool prepend_lxc_header(char *path, const char *t, char *const argv[])
{ {
long flen; long flen;
size_t len;
char *contents; char *contents;
FILE *f; FILE *f;
int ret = -1; int ret = -1;
@ -1593,15 +1594,30 @@ static bool prepend_lxc_header(char *path, const char *t, char *const argv[])
if (f == NULL) if (f == NULL)
return false; return false;
if (fseek(f, 0, SEEK_END) < 0) ret = fseek(f, 0, SEEK_END);
if (ret < 0)
goto out_error; goto out_error;
if ((flen = ftell(f)) < 0)
ret = -1;
flen = ftell(f);
if (flen < 0)
goto out_error; goto out_error;
if (fseek(f, 0, SEEK_SET) < 0)
ret = fseek(f, 0, SEEK_SET);
if (ret < 0)
goto out_error; goto out_error;
if ((contents = malloc(flen + 1)) == NULL)
ret = fseek(f, 0, SEEK_SET);
if (ret < 0)
goto out_error; goto out_error;
if (fread(contents, 1, flen, f) != flen)
ret = -1;
contents = malloc(flen + 1);
if (!contents)
goto out_error;
len = fread(contents, 1, flen, f);
if (len != flen)
goto out_free_contents; goto out_free_contents;
contents[flen] = '\0'; contents[flen] = '\0';
@ -1613,25 +1629,25 @@ static bool prepend_lxc_header(char *path, const char *t, char *const argv[])
#if HAVE_LIBGNUTLS #if HAVE_LIBGNUTLS
tpath = get_template_path(t); tpath = get_template_path(t);
if (!tpath) { if (!tpath) {
ERROR("bad template: %s", t); ERROR("Invalid template \"%s\" specified", t);
goto out_free_contents; goto out_free_contents;
} }
ret = sha1sum_file(tpath, md_value); ret = sha1sum_file(tpath, md_value);
if (ret < 0) {
ERROR("Error getting sha1sum of %s", tpath);
free(tpath); free(tpath);
if (ret < 0) {
ERROR("Failed to get sha1sum of %s", tpath);
goto out_free_contents; goto out_free_contents;
} }
free(tpath);
#endif #endif
f = fopen(path, "w"); f = fopen(path, "w");
if (f == NULL) { if (f == NULL) {
SYSERROR("reopening config for writing"); SYSERROR("Reopening config for writing");
free(contents); free(contents);
return false; return false;
} }
fprintf(f, "# Template used to create this container: %s\n", t); fprintf(f, "# Template used to create this container: %s\n", t);
if (argv) { if (argv) {
fprintf(f, "# Parameters passed to the template:"); fprintf(f, "# Parameters passed to the template:");
@ -1657,9 +1673,12 @@ static bool prepend_lxc_header(char *path, const char *t, char *const argv[])
fclose(f); fclose(f);
return false; return false;
} }
ret = 0; ret = 0;
out_free_contents: out_free_contents:
free(contents); free(contents);
out_error: out_error:
if (f) { if (f) {
int newret; int newret;
@ -1667,10 +1686,12 @@ out_error:
if (ret == 0) if (ret == 0)
ret = newret; ret = newret;
} }
if (ret < 0) { if (ret < 0) {
SYSERROR("Error prepending header"); SYSERROR("Error prepending header");
return false; return false;
} }
return true; return true;
} }