friedkiwi/qemu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/af-xdp: fix type overflow

Browse Source 
In for-loop in net_init_af_xdp, we do nc->queue_index = i,
where is is int64_t for 0 to queues-1, and nc->queue_index is
unsigned int.

Also in parse_socket_fds, g_strv_length() returns guint which
is equivalent to unsigned int.

Let's simply use int type for queues, and update the check
appropriately. It could be unsigned int, but in future commits
we'll share with net/tap.c the common function which will return
number of queues or negative error. So, let's simply use int for
queues-related variables, that simplifies things.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Ben Chaney <bchaney@akamai.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy
2026-03-18 14:31:31 +03:00
committed by Jason Wang
parent cbf877d67a
commit fb96c3e818
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
net/af-xdp.c
View File

@@ -442,14 +442,14 @@ static NetClientInfo net_af_xdp_info = {
};
static int *parse_socket_fds(const char *sock_fds_str,
int64_t n_expected, Error **errp)
int n_expected, Error **errp)
{
gchar **substrings = g_strsplit(sock_fds_str, ":", -1);
int64_t i, n_sock_fds = g_strv_length(substrings);
int i, n_sock_fds = g_strv_length(substrings);
int *sock_fds = NULL;
if (n_sock_fds != n_expected) {
error_setg(errp, "expected %"PRIi64" socket fds, got %"PRIi64,
error_setg(errp, "expected %d socket fds, got %d",
n_expected, n_sock_fds);
goto exit;
}
@@ -484,7 +484,7 @@ int net_init_af_xdp(const Netdev *netdev,
unsigned int ifindex;
uint32_t prog_id = 0;
g_autofree int *sock_fds = NULL;
int64_t i, queues;
int i, queues;
Error *err = NULL;
AFXDPState *s;
bool inhibit;
@@ -496,13 +496,14 @@ int net_init_af_xdp(const Netdev *netdev,
return -1;
}
queues = opts->has_queues ? opts->queues : 1;
if (queues < 1) {
if (opts->has_queues && (opts->queues < 1 || opts->queues > INT_MAX)) {
error_setg(errp, "invalid number of queues (%" PRIi64 ") for '%s'",
queues, opts->ifname);
opts->queues, opts->ifname);
return -1;
}
queues = opts->has_queues ? opts->queues : 1;
inhibit = opts->has_inhibit && opts->inhibit;
if (inhibit && !opts->sock_fds && !opts->map_path) {
error_setg(errp, "'inhibit=on' requires 'sock-fds' or 'map-path'");
@@ -537,7 +538,7 @@ int net_init_af_xdp(const Netdev *netdev,
for (i = 0; i < queues; i++) {
nc = qemu_new_net_client(&net_af_xdp_info, peer, "af-xdp", name);
qemu_set_info_str(nc, "af-xdp%"PRIi64" to %s", i, opts->ifname);
qemu_set_info_str(nc, "af-xdp%d to %s", i, opts->ifname);
nc->queue_index = i;
if (!nc0) {