External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 07:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

virt-aa-helper: remove replace_string and use virStringReplace instead

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-05-13 10:48:12 +02:00
parent 9575cb8554
commit 3902f634bf
1 changed files with 10 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/security/virt-aa-helper.c
View File

@ -147,62 +147,6 @@ vah_info(const char *str)
fprintf(stderr, _("%s:\n%s%c"), progname, str, '\n'); fprintf(stderr, _("%s:\n%s%c"), progname, str, '\n');
} }
/*
* Replace @oldstr in @orig with @repstr
* @len is number of bytes allocated for @orig. Assumes @orig, @oldstr and
* @repstr are null terminated
*/
static int
replace_string(char *orig, const size_t len, const char *oldstr,
const char *repstr)
{
int idx;
char *pos = NULL;
char *tmp = NULL;
if ((pos = strstr(orig, oldstr)) == NULL) {
vah_error(NULL, 0, _("could not find replacement string"));
return -1;
}
if (VIR_ALLOC_N_QUIET(tmp, len) < 0) {
vah_error(NULL, 0, _("could not allocate memory for string"));
return -1;
}
tmp[0] = '\0';
idx = abs(pos - orig);
/* copy everything up to oldstr */
strncat(tmp, orig, idx);
/* add the replacement string */
if (strlen(tmp) + strlen(repstr) > len - 1) {
vah_error(NULL, 0, _("not enough space in target buffer"));
VIR_FREE(tmp);
return -1;
}
strcat(tmp, repstr);
/* add everything after oldstr */
if (strlen(tmp) + strlen(orig) - (idx + strlen(oldstr)) > len - 1) {
vah_error(NULL, 0, _("not enough space in target buffer"));
VIR_FREE(tmp);
return -1;
}
strncat(tmp, orig + idx + strlen(oldstr),
strlen(orig) - (idx + strlen(oldstr)));
if (virStrcpy(orig, tmp, len) == NULL) {
vah_error(NULL, 0, _("error replacing string"));
VIR_FREE(tmp);
return -1;
}
VIR_FREE(tmp);
return 0;
}
/* /*
* run an apparmor_parser command * run an apparmor_parser command
*/ */
@ -340,6 +284,7 @@ create_profile(const char *profile, const char *profile_name,
char *pcontent = NULL; char *pcontent = NULL;
char *replace_name = NULL; char *replace_name = NULL;
char *replace_files = NULL; char *replace_files = NULL;
char *tmp = NULL;
const char *template_name = "\nprofile LIBVIRT_TEMPLATE"; const char *template_name = "\nprofile LIBVIRT_TEMPLATE";
const char *template_end = "\n}"; const char *template_end = "\n}";
int tlen, plen; int tlen, plen;
@ -412,19 +357,16 @@ create_profile(const char *profile, const char *profile_name,
goto clean_replace; goto clean_replace;
} }
if (VIR_ALLOC_N_QUIET(pcontent, plen) < 0) { if (!(pcontent = virStringReplace(tcontent, template_name, replace_name)))
vah_error(NULL, 0, _("could not allocate memory for profile")); goto clean_all;
goto clean_replace;
if (virtType != VIR_DOMAIN_VIRT_LXC) {
if (!(tmp = virStringReplace(pcontent, template_end, replace_files)))
goto clean_all;
VIR_FREE(pcontent);
pcontent = tmp;
tmp = NULL;
} }
pcontent[0] = '\0';
strcpy(pcontent, tcontent);
if (replace_string(pcontent, plen, template_name, replace_name) < 0)
goto clean_all;
if ((virtType != VIR_DOMAIN_VIRT_LXC) &&
replace_string(pcontent, plen, template_end, replace_files) < 0)
goto clean_all;
/* write the file */ /* write the file */
if ((fd = open(profile, O_CREAT | O_EXCL | O_WRONLY, 0644)) == -1) { if ((fd = open(profile, O_CREAT | O_EXCL | O_WRONLY, 0644)) == -1) {