NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

security: move chardevData declaration

Browse Source 
Declare it at the beginning of the function
instead of right before use.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2020-07-28 19:59:54 +02:00
parent 07360a0101
commit c93bcd339c
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/security/security_dac.c
View File

@ -1945,6 +1945,11 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr,
size_t i; size_t i;
int rc = 0; int rc = 0;
struct _virSecuritySELinuxChardevCallbackData chardevData = {
.mgr = mgr,
.chardevStdioLogd = chardevStdioLogd,
};
secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME);
if (!priv->dynamicOwnership || (secdef && !secdef->relabel)) if (!priv->dynamicOwnership || (secdef && !secdef->relabel))
@ -1986,11 +1991,6 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr,
rc = -1; rc = -1;
} }
struct _virSecuritySELinuxChardevCallbackData chardevData = {
.mgr = mgr,
.chardevStdioLogd = chardevStdioLogd,
};
if (virDomainChrDefForeach(def, if (virDomainChrDefForeach(def,
false, false,
virSecurityDACRestoreChardevCallback, virSecurityDACRestoreChardevCallback,
@ -2152,6 +2152,11 @@ virSecurityDACSetAllLabel(virSecurityManagerPtr mgr,
uid_t user; uid_t user;
gid_t group; gid_t group;
struct _virSecuritySELinuxChardevCallbackData chardevData = {
.mgr = mgr,
.chardevStdioLogd = chardevStdioLogd,
};
secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME);
if (!priv->dynamicOwnership || (secdef && !secdef->relabel)) if (!priv->dynamicOwnership || (secdef && !secdef->relabel))
@ -2192,11 +2197,6 @@ virSecurityDACSetAllLabel(virSecurityManagerPtr mgr,
return -1; return -1;
} }
struct _virSecuritySELinuxChardevCallbackData chardevData = {
.mgr = mgr,
.chardevStdioLogd = chardevStdioLogd,
};
if (virDomainChrDefForeach(def, if (virDomainChrDefForeach(def,
true, true,
virSecurityDACSetChardevCallback, virSecurityDACSetChardevCallback,

20
src/security/security_selinux.c
View File

@ -2767,6 +2767,11 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManagerPtr mgr,
size_t i; size_t i;
int rc = 0; int rc = 0;
struct _virSecuritySELinuxChardevCallbackData chardevData = {
.mgr = mgr,
.chardevStdioLogd = chardevStdioLogd
};
VIR_DEBUG("Restoring security label on %s migrated=%d", def->name, migrated); VIR_DEBUG("Restoring security label on %s migrated=%d", def->name, migrated);
secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME);
@ -2805,11 +2810,6 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManagerPtr mgr,
rc = -1; rc = -1;
} }
struct _virSecuritySELinuxChardevCallbackData chardevData = {
.mgr = mgr,
.chardevStdioLogd = chardevStdioLogd
};
if (virDomainChrDefForeach(def, if (virDomainChrDefForeach(def,
false, false,
virSecuritySELinuxRestoreSecurityChardevCallback, virSecuritySELinuxRestoreSecurityChardevCallback,
@ -3165,6 +3165,11 @@ virSecuritySELinuxSetAllLabel(virSecurityManagerPtr mgr,
virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr); virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr);
virSecurityLabelDefPtr secdef; virSecurityLabelDefPtr secdef;
struct _virSecuritySELinuxChardevCallbackData chardevData = {
.mgr = mgr,
.chardevStdioLogd = chardevStdioLogd
};
secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME);
if (!secdef || !secdef->relabel || data->skipAllLabel) if (!secdef || !secdef->relabel || data->skipAllLabel)
@ -3208,11 +3213,6 @@ virSecuritySELinuxSetAllLabel(virSecurityManagerPtr mgr,
return -1; return -1;
} }
struct _virSecuritySELinuxChardevCallbackData chardevData = {
.mgr = mgr,
.chardevStdioLogd = chardevStdioLogd
};
if (virDomainChrDefForeach(def, if (virDomainChrDefForeach(def,
true, true,
virSecuritySELinuxSetSecurityChardevCallback, virSecuritySELinuxSetSecurityChardevCallback,