* [Qemu-devel] [PULL 0/5] Net patches
@ 2019-07-29 8:33 Jason Wang
2019-07-29 8:33 ` [Qemu-devel] [PULL 1/5] e1000: don't raise interrupt in pre_save() Jason Wang
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: Jason Wang @ 2019-07-29 8:33 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: Jason Wang
The following changes since commit fff3159900d2b95613a9cb75fc3703e67a674729:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190726' into staging (2019-07-26 16:23:07 +0100)
are available in the git repository at:
https://github.com/jasowang/qemu.git tags/net-pull-request
for you to fetch changes up to f77bed14f01557596727c4eea042e9818c242049:
net/colo-compare.c: Fix memory leak and code style issue. (2019-07-29 16:29:30 +0800)
----------------------------------------------------------------
----------------------------------------------------------------
Jason Wang (1):
e1000: don't raise interrupt in pre_save()
Prasad J Pandit (3):
qemu-bridge-helper: restrict interface name to IFNAMSIZ
qemu-bridge-helper: move repeating code in parse_acl_file
net: tap: replace snprintf with g_strdup_printf calls
Zhang Chen (1):
net/colo-compare.c: Fix memory leak and code style issue.
hw/net/e1000.c | 8 ++------
net/colo-compare.c | 27 ++++++++++++++++++++-------
net/tap.c | 19 +++++++++++--------
qemu-bridge-helper.c | 24 +++++++++++++++++-------
4 files changed, 50 insertions(+), 28 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL 1/5] e1000: don't raise interrupt in pre_save()
2019-07-29 8:33 [Qemu-devel] [PULL 0/5] Net patches Jason Wang
@ 2019-07-29 8:33 ` Jason Wang
2019-07-29 8:33 ` [Qemu-devel] [PULL 2/5] qemu-bridge-helper: restrict interface name to IFNAMSIZ Jason Wang
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Jason Wang @ 2019-07-29 8:33 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: Jason Wang
We should not raise any interrupt after VM has been stopped but this
is what e1000 currently did when mit timer is active in
pre_save(). Fixing this by scheduling a timer in post_load() which can
make sure the interrupt was raised when VM is running.
Reported-and-tested-by: Longpeng <longpeng2@huawei.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/e1000.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 1dc1466..a023ceb 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -1381,11 +1381,6 @@ static int e1000_pre_save(void *opaque)
E1000State *s = opaque;
NetClientState *nc = qemu_get_queue(s->nic);
- /* If the mitigation timer is active, emulate a timeout now. */
- if (s->mit_timer_on) {
- e1000_mit_timer(s);
- }
-
/*
* If link is down and auto-negotiation is supported and ongoing,
* complete auto-negotiation immediately. This allows us to look
@@ -1423,7 +1418,8 @@ static int e1000_post_load(void *opaque, int version_id)
s->mit_irq_level = false;
}
s->mit_ide = 0;
- s->mit_timer_on = false;
+ s->mit_timer_on = true;
+ timer_mod(s->mit_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 1);
/* nc.link_down can't be migrated, so infer link_down according
* to link status bit in mac_reg[STATUS].
--
2.5.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL 2/5] qemu-bridge-helper: restrict interface name to IFNAMSIZ
2019-07-29 8:33 [Qemu-devel] [PULL 0/5] Net patches Jason Wang
2019-07-29 8:33 ` [Qemu-devel] [PULL 1/5] e1000: don't raise interrupt in pre_save() Jason Wang
@ 2019-07-29 8:33 ` Jason Wang
2019-07-29 8:33 ` [Qemu-devel] [PULL 3/5] qemu-bridge-helper: move repeating code in parse_acl_file Jason Wang
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Jason Wang @ 2019-07-29 8:33 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: Jason Wang, Prasad J Pandit
From: Prasad J Pandit <pjp@fedoraproject.org>
The network interface name in Linux is defined to be of size
IFNAMSIZ(=16), including the terminating null('\0') byte.
The same is applied to interface names read from 'bridge.conf'
file to form ACL rules. If user supplied '--br=bridge' name
is not restricted to the same length, it could lead to ACL bypass
issue. Restrict interface name to IFNAMSIZ, including null byte.
Reported-by: Riccardo Schirone <rschiron@redhat.com>
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>
---
qemu-bridge-helper.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c
index 95624bc..2058e10 100644
--- a/qemu-bridge-helper.c
+++ b/qemu-bridge-helper.c
@@ -119,6 +119,13 @@ static int parse_acl_file(const char *filename, ACLList *acl_list)
}
*argend = 0;
+ 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;
+ }
+
if (strcmp(cmd, "deny") == 0) {
acl_rule = g_malloc(sizeof(*acl_rule));
if (strcmp(arg, "all") == 0) {
@@ -269,6 +276,10 @@ int main(int argc, char **argv)
usage();
return EXIT_FAILURE;
}
+ if (strlen(bridge) >= IFNAMSIZ) {
+ fprintf(stderr, "name `%s' too long: %zu\n", bridge, strlen(bridge));
+ return EXIT_FAILURE;
+ }
/* parse default acl file */
QSIMPLEQ_INIT(&acl_list);
--
2.5.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL 3/5] qemu-bridge-helper: move repeating code in parse_acl_file
2019-07-29 8:33 [Qemu-devel] [PULL 0/5] Net patches Jason Wang
2019-07-29 8:33 ` [Qemu-devel] [PULL 1/5] e1000: don't raise interrupt in pre_save() Jason Wang
2019-07-29 8:33 ` [Qemu-devel] [PULL 2/5] qemu-bridge-helper: restrict interface name to IFNAMSIZ Jason Wang
@ 2019-07-29 8:33 ` Jason Wang
2019-07-29 8:33 ` [Qemu-devel] [PULL 4/5] net: tap: replace snprintf with g_strdup_printf calls Jason Wang
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Jason Wang @ 2019-07-29 8:33 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: Jason Wang, Prasad J Pandit
From: Prasad J Pandit <pjp@fedoraproject.org>
Move repeating error handling sequence in parse_acl_file routine
to an 'err' label.
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>
---
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 2058e10..3d50ec0 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.5.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL 4/5] net: tap: replace snprintf with g_strdup_printf calls
2019-07-29 8:33 [Qemu-devel] [PULL 0/5] Net patches Jason Wang
` (2 preceding siblings ...)
2019-07-29 8:33 ` [Qemu-devel] [PULL 3/5] qemu-bridge-helper: move repeating code in parse_acl_file Jason Wang
@ 2019-07-29 8:33 ` Jason Wang
2019-07-29 8:33 ` [Qemu-devel] [PULL 5/5] net/colo-compare.c: Fix memory leak and code style issue Jason Wang
2019-07-29 11:47 ` [Qemu-devel] [PULL 0/5] Net patches Peter Maydell
5 siblings, 0 replies; 8+ messages in thread
From: Jason Wang @ 2019-07-29 8:33 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: Jason Wang, Prasad J Pandit
From: Prasad J Pandit <pjp@fedoraproject.org>
When invoking qemu-bridge-helper in 'net_bridge_run_helper',
instead of using fixed sized buffers, use dynamically allocated
ones initialised and returned by g_strdup_printf().
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/tap.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/net/tap.c b/net/tap.c
index e8aadd8..fc38029 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -498,9 +498,9 @@ static int net_bridge_run_helper(const char *helper, const char *bridge,
}
if (pid == 0) {
int open_max = sysconf(_SC_OPEN_MAX), i;
- char fd_buf[6+10];
- char br_buf[6+IFNAMSIZ] = {0};
- char helper_cmd[PATH_MAX + sizeof(fd_buf) + sizeof(br_buf) + 15];
+ char *fd_buf = NULL;
+ char *br_buf = NULL;
+ char *helper_cmd = NULL;
for (i = 3; i < open_max; i++) {
if (i != sv[1]) {
@@ -508,17 +508,17 @@ static int net_bridge_run_helper(const char *helper, const char *bridge,
}
}
- snprintf(fd_buf, sizeof(fd_buf), "%s%d", "--fd=", sv[1]);
+ fd_buf = g_strdup_printf("%s%d", "--fd=", sv[1]);
if (strrchr(helper, ' ') || strrchr(helper, '\t')) {
/* assume helper is a command */
if (strstr(helper, "--br=") == NULL) {
- snprintf(br_buf, sizeof(br_buf), "%s%s", "--br=", bridge);
+ br_buf = g_strdup_printf("%s%s", "--br=", bridge);
}
- snprintf(helper_cmd, sizeof(helper_cmd), "%s %s %s %s",
- helper, "--use-vnet", fd_buf, br_buf);
+ helper_cmd = g_strdup_printf("%s %s %s %s", helper,
+ "--use-vnet", fd_buf, br_buf ? br_buf : "");
parg = args;
*parg++ = (char *)"sh";
@@ -527,10 +527,11 @@ static int net_bridge_run_helper(const char *helper, const char *bridge,
*parg++ = NULL;
execv("/bin/sh", args);
+ g_free(helper_cmd);
} else {
/* assume helper is just the executable path name */
- snprintf(br_buf, sizeof(br_buf), "%s%s", "--br=", bridge);
+ br_buf = g_strdup_printf("%s%s", "--br=", bridge);
parg = args;
*parg++ = (char *)helper;
@@ -541,6 +542,8 @@ static int net_bridge_run_helper(const char *helper, const char *bridge,
execv(helper, args);
}
+ g_free(fd_buf);
+ g_free(br_buf);
_exit(1);
} else {
--
2.5.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL 5/5] net/colo-compare.c: Fix memory leak and code style issue.
2019-07-29 8:33 [Qemu-devel] [PULL 0/5] Net patches Jason Wang
` (3 preceding siblings ...)
2019-07-29 8:33 ` [Qemu-devel] [PULL 4/5] net: tap: replace snprintf with g_strdup_printf calls Jason Wang
@ 2019-07-29 8:33 ` Jason Wang
2019-07-29 11:47 ` [Qemu-devel] [PULL 0/5] Net patches Peter Maydell
5 siblings, 0 replies; 8+ messages in thread
From: Jason Wang @ 2019-07-29 8:33 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: Zhang Chen, Jason Wang
From: Zhang Chen <chen.zhang@intel.com>
This patch to fix the origin "char *data" memory leak, code style issue
and add necessary check here.
Reported-by: Coverity (CID 1402785)
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/colo-compare.c | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 909dd6c..7489840 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -127,6 +127,17 @@ static int compare_chr_send(CompareState *s,
uint32_t vnet_hdr_len,
bool notify_remote_frame);
+static bool packet_matches_str(const char *str,
+ const uint8_t *buf,
+ uint32_t packet_len)
+{
+ if (packet_len != strlen(str)) {
+ return false;
+ }
+
+ return !memcmp(str, buf, strlen(str));
+}
+
static void notify_remote_frame(CompareState *s)
{
char msg[] = "DO_CHECKPOINT";
@@ -1008,21 +1019,23 @@ static void compare_notify_rs_finalize(SocketReadState *notify_rs)
{
CompareState *s = container_of(notify_rs, CompareState, notify_rs);
- /* Get Xen colo-frame's notify and handle the message */
- char *data = g_memdup(notify_rs->buf, notify_rs->packet_len);
- char msg[] = "COLO_COMPARE_GET_XEN_INIT";
+ const char msg[] = "COLO_COMPARE_GET_XEN_INIT";
int ret;
- if (!strcmp(data, "COLO_USERSPACE_PROXY_INIT")) {
+ if (packet_matches_str("COLO_USERSPACE_PROXY_INIT",
+ notify_rs->buf,
+ notify_rs->packet_len)) {
ret = compare_chr_send(s, (uint8_t *)msg, strlen(msg), 0, true);
if (ret < 0) {
error_report("Notify Xen COLO-frame INIT failed");
}
- }
-
- if (!strcmp(data, "COLO_CHECKPOINT")) {
+ } else if (packet_matches_str("COLO_CHECKPOINT",
+ notify_rs->buf,
+ notify_rs->packet_len)) {
/* colo-compare do checkpoint, flush pri packet and remove sec packet */
g_queue_foreach(&s->conn_list, colo_flush_packets, s);
+ } else {
+ error_report("COLO compare got unsupported instruction");
}
}
--
2.5.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PULL 0/5] Net patches
2019-07-29 8:33 [Qemu-devel] [PULL 0/5] Net patches Jason Wang
` (4 preceding siblings ...)
2019-07-29 8:33 ` [Qemu-devel] [PULL 5/5] net/colo-compare.c: Fix memory leak and code style issue Jason Wang
@ 2019-07-29 11:47 ` Peter Maydell
2019-07-29 12:50 ` Jason Wang
5 siblings, 1 reply; 8+ messages in thread
From: Peter Maydell @ 2019-07-29 11:47 UTC (permalink / raw)
To: Jason Wang; +Cc: QEMU Developers
On Mon, 29 Jul 2019 at 09:33, Jason Wang <jasowang@redhat.com> wrote:
>
> The following changes since commit fff3159900d2b95613a9cb75fc3703e67a674729:
>
> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190726' into staging (2019-07-26 16:23:07 +0100)
>
> are available in the git repository at:
>
> https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to f77bed14f01557596727c4eea042e9818c242049:
>
> net/colo-compare.c: Fix memory leak and code style issue. (2019-07-29 16:29:30 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Jason Wang (1):
> e1000: don't raise interrupt in pre_save()
>
> Prasad J Pandit (3):
> qemu-bridge-helper: restrict interface name to IFNAMSIZ
> qemu-bridge-helper: move repeating code in parse_acl_file
> net: tap: replace snprintf with g_strdup_printf calls
>
> Zhang Chen (1):
> net/colo-compare.c: Fix memory leak and code style issue.
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PULL 0/5] Net patches
2019-07-29 11:47 ` [Qemu-devel] [PULL 0/5] Net patches Peter Maydell
@ 2019-07-29 12:50 ` Jason Wang
0 siblings, 0 replies; 8+ messages in thread
From: Jason Wang @ 2019-07-29 12:50 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
On 2019/7/29 下午7:47, Peter Maydell wrote:
> On Mon, 29 Jul 2019 at 09:33, Jason Wang <jasowang@redhat.com> wrote:
>> The following changes since commit fff3159900d2b95613a9cb75fc3703e67a674729:
>>
>> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190726' into staging (2019-07-26 16:23:07 +0100)
>>
>> are available in the git repository at:
>>
>> https://github.com/jasowang/qemu.git tags/net-pull-request
>>
>> for you to fetch changes up to f77bed14f01557596727c4eea042e9818c242049:
>>
>> net/colo-compare.c: Fix memory leak and code style issue. (2019-07-29 16:29:30 +0800)
>>
>> ----------------------------------------------------------------
>>
>> ----------------------------------------------------------------
>> Jason Wang (1):
>> e1000: don't raise interrupt in pre_save()
>>
>> Prasad J Pandit (3):
>> qemu-bridge-helper: restrict interface name to IFNAMSIZ
>> qemu-bridge-helper: move repeating code in parse_acl_file
>> net: tap: replace snprintf with g_strdup_printf calls
>>
>> Zhang Chen (1):
>> net/colo-compare.c: Fix memory leak and code style issue.
>
> Applied, thanks.
>
> Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1
> for any user-visible changes.
>
> -- PMM
Thanks for the reminding.
There's no user-visible changes.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-07-29 12:51 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-29 8:33 [Qemu-devel] [PULL 0/5] Net patches Jason Wang
2019-07-29 8:33 ` [Qemu-devel] [PULL 1/5] e1000: don't raise interrupt in pre_save() Jason Wang
2019-07-29 8:33 ` [Qemu-devel] [PULL 2/5] qemu-bridge-helper: restrict interface name to IFNAMSIZ Jason Wang
2019-07-29 8:33 ` [Qemu-devel] [PULL 3/5] qemu-bridge-helper: move repeating code in parse_acl_file Jason Wang
2019-07-29 8:33 ` [Qemu-devel] [PULL 4/5] net: tap: replace snprintf with g_strdup_printf calls Jason Wang
2019-07-29 8:33 ` [Qemu-devel] [PULL 5/5] net/colo-compare.c: Fix memory leak and code style issue Jason Wang
2019-07-29 11:47 ` [Qemu-devel] [PULL 0/5] Net patches Peter Maydell
2019-07-29 12:50 ` Jason Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).