提交 6d12a1cb 编写于 作者: M Martin Kletzander

audit: Fix the output message for shmem

After some discussion on and off the linux-audit mailing list, we
should use different fields for the audit messages.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1218603Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>
上级 8b151209
...@@ -983,15 +983,13 @@ virDomainAuditShmem(virDomainObjPtr vm, ...@@ -983,15 +983,13 @@ virDomainAuditShmem(virDomainObjPtr vm,
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
char *vmname = virAuditEncode("vm", vm->def->name); char *vmname = virAuditEncode("vm", vm->def->name);
const char *srcpath = virDomainAuditChardevPath(&def->server.chr); const char *srcpath = virDomainAuditChardevPath(&def->server.chr);
char *src = virAuditEncode("server", VIR_AUDIT_STR(srcpath));
char *shmem = virAuditEncode("shmem", VIR_AUDIT_STR(def->name));
const char *virt = virDomainVirtTypeToString(vm->def->virtType); const char *virt = virDomainVirtTypeToString(vm->def->virtType);
char *size = NULL; char *shmpath = NULL;
virUUIDFormat(vm->def->uuid, uuidstr); virUUIDFormat(vm->def->uuid, uuidstr);
if (!vmname || !src || !shmem || if (!vmname ||
virAsprintfQuiet(&size, "%llu", def->size) < 0) { virAsprintfQuiet(&shmpath, "/dev/shm/%s", def->name) < 0) {
VIR_WARN("OOM while encoding audit message"); VIR_WARN("OOM while encoding audit message");
goto cleanup; goto cleanup;
} }
...@@ -1002,14 +1000,18 @@ virDomainAuditShmem(virDomainObjPtr vm, ...@@ -1002,14 +1000,18 @@ virDomainAuditShmem(virDomainObjPtr vm,
virt = "?"; virt = "?";
} }
VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, if (def->server.enabled) {
"virt=%s resrc=shmem reason=%s %s uuid=%s size=%s %s %s", VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success,
virt, reason, vmname, uuidstr, size, shmem, src); "virt=%s resrc=ivshmem-socket reason=%s %s uuid=%s path=%s",
virt, reason, vmname, uuidstr, VIR_AUDIT_STR(srcpath));
} else {
VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success,
"virt=%s resrc=shmem reason=%s %s uuid=%s size=%llu path=%s",
virt, reason, vmname, uuidstr, def->size, VIR_AUDIT_STR(shmpath));
}
cleanup: cleanup:
VIR_FREE(vmname); VIR_FREE(vmname);
VIR_FREE(src); VIR_FREE(shmpath);
VIR_FREE(size);
VIR_FREE(shmem);
return; return;
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册