431f30630a
Synch with IBS qemu: includes xen patches, security patches, some spec file cleanup, and finally getting qemu-bridge-helper working right. Also temporarily disable librbd dependency in OBS until staging impact concerns get resolved. OBS-URL: https://build.opensuse.org/request/show/416912 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=309
84 lines
2.6 KiB
Diff
84 lines
2.6 KiB
Diff
From 4bbd77b07de2f0df2e8a0dba9c4ca51299ee2518 Mon Sep 17 00:00:00 2001
|
|
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Tue, 2 Aug 2016 11:36:02 -0600
|
|
Subject: [PATCH] qemu-bridge-helper: reduce security profile
|
|
|
|
Change from using glib alloc and free routines to those
|
|
from libc. Also perform safety measure of dropping privs
|
|
to user if configured no-caps.
|
|
|
|
[BR: BOO#988279]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
qemu-bridge-helper.c | 29 ++++++++++++++++++++++++-----
|
|
1 file changed, 24 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c
|
|
index 830fb9e..73ac49b 100644
|
|
--- a/qemu-bridge-helper.c
|
|
+++ b/qemu-bridge-helper.c
|
|
@@ -15,8 +15,6 @@
|
|
|
|
#include "qemu/osdep.h"
|
|
|
|
-#include <glib.h>
|
|
-
|
|
#include <sys/ioctl.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/un.h>
|
|
@@ -111,7 +109,12 @@ static int parse_acl_file(const char *filename, ACLList *acl_list)
|
|
*argend = 0;
|
|
|
|
if (strcmp(cmd, "deny") == 0) {
|
|
- acl_rule = g_malloc(sizeof(*acl_rule));
|
|
+ acl_rule = calloc(1, sizeof(*acl_rule));
|
|
+ if (!acl_rule) {
|
|
+ fclose(f);
|
|
+ errno = ENOMEM;
|
|
+ return -1;
|
|
+ }
|
|
if (strcmp(arg, "all") == 0) {
|
|
acl_rule->type = ACL_DENY_ALL;
|
|
} else {
|
|
@@ -120,7 +123,12 @@ static int parse_acl_file(const char *filename, ACLList *acl_list)
|
|
}
|
|
QSIMPLEQ_INSERT_TAIL(acl_list, acl_rule, entry);
|
|
} else if (strcmp(cmd, "allow") == 0) {
|
|
- acl_rule = g_malloc(sizeof(*acl_rule));
|
|
+ acl_rule = calloc(1, sizeof(*acl_rule));
|
|
+ if (!acl_rule) {
|
|
+ fclose(f);
|
|
+ errno = ENOMEM;
|
|
+ return -1;
|
|
+ }
|
|
if (strcmp(arg, "all") == 0) {
|
|
acl_rule->type = ACL_ALLOW_ALL;
|
|
} else {
|
|
@@ -414,6 +422,17 @@ int main(int argc, char **argv)
|
|
goto cleanup;
|
|
}
|
|
|
|
+#ifndef CONFIG_LIBCAP
|
|
+ /* avoid sending the fd as root user if running suid to not fool
|
|
+ * peer credentials to daemons that dont expect that
|
|
+ */
|
|
+ if (setuid(getuid()) < 0) {
|
|
+ fprintf(stderr, "Failed to drop privileges.\n");
|
|
+ ret = EXIT_FAILURE;
|
|
+ goto cleanup;
|
|
+ }
|
|
+#endif
|
|
+
|
|
/* write fd to the domain socket */
|
|
if (send_fd(unixfd, fd) == -1) {
|
|
fprintf(stderr, "failed to write fd to unix socket: %s\n",
|
|
@@ -435,7 +454,7 @@ cleanup:
|
|
}
|
|
while ((acl_rule = QSIMPLEQ_FIRST(&acl_list)) != NULL) {
|
|
QSIMPLEQ_REMOVE_HEAD(&acl_list, entry);
|
|
- g_free(acl_rule);
|
|
+ free(acl_rule);
|
|
}
|
|
|
|
return ret;
|