76 lines
2.1 KiB
Diff
76 lines
2.1 KiB
Diff
From 3283dde4b5b5cce0f96f48d536bebff66d97ce0b Mon Sep 17 00:00:00 2001
|
|
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Date: Tue, 23 Jul 2019 16:17:53 +0530
|
|
Subject: [PATCH 2/2] qemu-bridge-helper: move repeating code in parse_acl_file
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Move repeating error handling sequence in parse_acl_file routine
|
|
to an 'err' label.
|
|
|
|
This patch fixes CVE-2019-13164.
|
|
|
|
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Reviewed-by: Li Qiang <liq3ea@gmail.com>
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
(cherry-picked from commit 3283dde4b5b5cce0f96f48d536bebff66d97ce0b)
|
|
---
|
|
qemu-bridge-helper.c | 19 +++++++++----------
|
|
1 file changed, 9 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c
|
|
index 2058e10454..3d50ec094c 100644
|
|
--- a/qemu-bridge-helper.c
|
|
+++ b/qemu-bridge-helper.c
|
|
@@ -102,9 +102,7 @@ static int parse_acl_file(const char *filename, ACLList *acl_list)
|
|
|
|
if (arg == NULL) {
|
|
fprintf(stderr, "Invalid config line:\n %s\n", line);
|
|
- fclose(f);
|
|
- errno = EINVAL;
|
|
- return -1;
|
|
+ goto err;
|
|
}
|
|
|
|
*arg = 0;
|
|
@@ -121,9 +119,7 @@ static int parse_acl_file(const char *filename, ACLList *acl_list)
|
|
|
|
if (!g_str_equal(cmd, "include") && strlen(arg) >= IFNAMSIZ) {
|
|
fprintf(stderr, "name `%s' too long: %zu\n", arg, strlen(arg));
|
|
- fclose(f);
|
|
- errno = EINVAL;
|
|
- return -1;
|
|
+ goto err;
|
|
}
|
|
|
|
if (strcmp(cmd, "deny") == 0) {
|
|
@@ -149,15 +145,18 @@ static int parse_acl_file(const char *filename, ACLList *acl_list)
|
|
parse_acl_file(arg, acl_list);
|
|
} else {
|
|
fprintf(stderr, "Unknown command `%s'\n", cmd);
|
|
- fclose(f);
|
|
- errno = EINVAL;
|
|
- return -1;
|
|
+ goto err;
|
|
}
|
|
}
|
|
|
|
fclose(f);
|
|
-
|
|
return 0;
|
|
+
|
|
+err:
|
|
+ fclose(f);
|
|
+ errno = EINVAL;
|
|
+ return -1;
|
|
+
|
|
}
|
|
|
|
static bool has_vnet_hdr(int fd)
|
|
--
|
|
2.19.1
|
|
|