* [PULL 1/5] hw/net/e1000e: advance desc_offset in case of null descriptor
2020-11-24 2:44 [PULL 0/5] Net patches Jason Wang
@ 2020-11-24 2:44 ` Jason Wang
2020-11-24 2:44 ` [PULL 2/5] net: do not exit on "netdev_add help" monitor command Jason Wang
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Jason Wang @ 2020-11-24 2:44 UTC (permalink / raw)
To: peter.maydell, qemu-devel; +Cc: Jason Wang, Prasad J Pandit
From: Prasad J Pandit <pjp@fedoraproject.org>
While receiving packets via e1000e_write_packet_to_guest() routine,
'desc_offset' is advanced only when RX descriptor is processed. And
RX descriptor is not processed if it has NULL buffer address.
This may lead to an infinite loop condition. Increament 'desc_offset'
to process next descriptor in the ring to avoid infinite loop.
Reported-by: Cheol-woo Myung <330cjfdn@gmail.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/e1000e_core.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index d8b9e4b..095c01e 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -1596,13 +1596,13 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct NetRxPkt *pkt,
(const char *) &fcs_pad, e1000x_fcs_len(core->mac));
}
}
- desc_offset += desc_size;
- if (desc_offset >= total_size) {
- is_last = true;
- }
} else { /* as per intel docs; skip descriptors with null buf addr */
trace_e1000e_rx_null_descriptor();
}
+ desc_offset += desc_size;
+ if (desc_offset >= total_size) {
+ is_last = true;
+ }
e1000e_write_rx_descr(core, desc, is_last ? core->rx_pkt : NULL,
rss_info, do_ps ? ps_hdr_len : 0, &bastate.written);
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PULL 2/5] net: do not exit on "netdev_add help" monitor command
2020-11-24 2:44 [PULL 0/5] Net patches Jason Wang
2020-11-24 2:44 ` [PULL 1/5] hw/net/e1000e: advance desc_offset in case of null descriptor Jason Wang
@ 2020-11-24 2:44 ` Jason Wang
2020-11-24 2:44 ` [PULL 3/5] net: purge queued rx packets on queue deletion Jason Wang
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Jason Wang @ 2020-11-24 2:44 UTC (permalink / raw)
To: peter.maydell, qemu-devel; +Cc: Paolo Bonzini, Jason Wang
From: Paolo Bonzini <pbonzini@redhat.com>
"netdev_add help" is causing QEMU to exit because the code that
invokes show_netdevs is shared between CLI and HMP processing.
Move the check to the callers so that exit(0) remains only
in the CLI flow.
"netdev_add help" is not fixed by this patch; that is left for
later work.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
include/net/net.h | 1 +
monitor/hmp-cmds.c | 6 +++++
net/net.c | 68 +++++++++++++++++++++++++++---------------------------
3 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/include/net/net.h b/include/net/net.h
index 897b2d7..778fc78 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -199,6 +199,7 @@ extern const char *host_net_devices[];
/* from net.c */
int net_client_parse(QemuOptsList *opts_list, const char *str);
+void show_netdevs(void);
int net_init_clients(Error **errp);
void net_check_clients(void);
void net_cleanup(void);
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index a6a6684..65d8ff4 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -24,6 +24,7 @@
#include "qemu/option.h"
#include "qemu/timer.h"
#include "qemu/sockets.h"
+#include "qemu/help_option.h"
#include "monitor/monitor-internal.h"
#include "qapi/error.h"
#include "qapi/clone-visitor.h"
@@ -1631,7 +1632,12 @@ void hmp_netdev_add(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
QemuOpts *opts;
+ const char *type = qdict_get_try_str(qdict, "type");
+ if (type && is_help_option(type)) {
+ show_netdevs();
+ return;
+ }
opts = qemu_opts_from_qdict(qemu_find_opts("netdev"), qdict, &err);
if (err) {
goto out;
diff --git a/net/net.c b/net/net.c
index 794c652..6362d30 100644
--- a/net/net.c
+++ b/net/net.c
@@ -44,6 +44,7 @@
#include "qemu/config-file.h"
#include "qemu/ctype.h"
#include "qemu/iov.h"
+#include "qemu/qemu-print.h"
#include "qemu/main-loop.h"
#include "qemu/option.h"
#include "qapi/error.h"
@@ -1025,7 +1026,7 @@ static int net_client_init1(const Netdev *netdev, bool is_netdev, Error **errp)
return 0;
}
-static void show_netdevs(void)
+void show_netdevs(void)
{
int idx;
const char *available_netdevs[] = {
@@ -1055,9 +1056,9 @@ static void show_netdevs(void)
#endif
};
- printf("Available netdev backend types:\n");
+ qemu_printf("Available netdev backend types:\n");
for (idx = 0; idx < ARRAY_SIZE(available_netdevs); idx++) {
- puts(available_netdevs[idx]);
+ qemu_printf("%s\n", available_netdevs[idx]);
}
}
@@ -1068,42 +1069,35 @@ static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)
int ret = -1;
Visitor *v = opts_visitor_new(opts);
- const char *type = qemu_opt_get(opts, "type");
-
- if (is_netdev && type && is_help_option(type)) {
- show_netdevs();
- exit(0);
- } else {
- /* Parse convenience option format ip6-net=fec0::0[/64] */
- const char *ip6_net = qemu_opt_get(opts, "ipv6-net");
+ /* Parse convenience option format ip6-net=fec0::0[/64] */
+ const char *ip6_net = qemu_opt_get(opts, "ipv6-net");
- if (ip6_net) {
- char *prefix_addr;
- unsigned long prefix_len = 64; /* Default 64bit prefix length. */
+ if (ip6_net) {
+ char *prefix_addr;
+ unsigned long prefix_len = 64; /* Default 64bit prefix length. */
- substrings = g_strsplit(ip6_net, "/", 2);
- if (!substrings || !substrings[0]) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "ipv6-net",
- "a valid IPv6 prefix");
- goto out;
- }
+ substrings = g_strsplit(ip6_net, "/", 2);
+ if (!substrings || !substrings[0]) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "ipv6-net",
+ "a valid IPv6 prefix");
+ goto out;
+ }
- prefix_addr = substrings[0];
+ prefix_addr = substrings[0];
- /* Handle user-specified prefix length. */
- if (substrings[1] &&
- qemu_strtoul(substrings[1], NULL, 10, &prefix_len))
- {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "ipv6-prefixlen", "a number");
- goto out;
- }
-
- qemu_opt_set(opts, "ipv6-prefix", prefix_addr, &error_abort);
- qemu_opt_set_number(opts, "ipv6-prefixlen", prefix_len,
- &error_abort);
- qemu_opt_unset(opts, "ipv6-net");
+ /* Handle user-specified prefix length. */
+ if (substrings[1] &&
+ qemu_strtoul(substrings[1], NULL, 10, &prefix_len))
+ {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
+ "ipv6-prefixlen", "a number");
+ goto out;
}
+
+ qemu_opt_set(opts, "ipv6-prefix", prefix_addr, &error_abort);
+ qemu_opt_set_number(opts, "ipv6-prefixlen", prefix_len,
+ &error_abort);
+ qemu_opt_unset(opts, "ipv6-net");
}
/* Create an ID for -net if the user did not specify one */
@@ -1421,6 +1415,12 @@ static int net_init_client(void *dummy, QemuOpts *opts, Error **errp)
static int net_init_netdev(void *dummy, QemuOpts *opts, Error **errp)
{
+ const char *type = qemu_opt_get(opts, "type");
+
+ if (type && is_help_option(type)) {
+ show_netdevs();
+ exit(0);
+ }
return net_client_init(opts, true, errp);
}
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PULL 4/5] tap: fix a memory leak
2020-11-24 2:44 [PULL 0/5] Net patches Jason Wang
` (2 preceding siblings ...)
2020-11-24 2:44 ` [PULL 3/5] net: purge queued rx packets on queue deletion Jason Wang
@ 2020-11-24 2:44 ` Jason Wang
2020-11-24 2:44 ` [PULL 5/5] net: Use correct default-path macro for downscript Jason Wang
2020-11-24 13:33 ` [PULL 0/5] Net patches Peter Maydell
5 siblings, 0 replies; 7+ messages in thread
From: Jason Wang @ 2020-11-24 2:44 UTC (permalink / raw)
To: peter.maydell, qemu-devel; +Cc: yuanjungong, Jason Wang
From: yuanjungong <ruc_gongyuanjun@163.com>
Close fd before returning.
Buglink: https://bugs.launchpad.net/qemu/+bug/1904486
Signed-off-by: yuanjungong <ruc_gongyuanjun@163.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/tap.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/tap.c b/net/tap.c
index c46ff66..fe95fa7 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -817,6 +817,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
if (ret < 0) {
error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
name, fd);
+ close(fd);
return -1;
}
@@ -831,6 +832,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
vhostfdname, vnet_hdr, fd, &err);
if (err) {
error_propagate(errp, err);
+ close(fd);
return -1;
}
} else if (tap->has_fds) {
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread