OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Add G_GNUC_PRINTF to function qemu_set_info_str and fix related issues

Browse Source 
With the G_GNUC_PRINTF function attribute the compiler detects
two potential insecure format strings:

../../../net/stream.c:248:31: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
    qemu_set_info_str(&s->nc, uri);
                              ^~~
../../../net/stream.c:322:31: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
    qemu_set_info_str(&s->nc, uri);
                              ^~~

There are also two other warnings:

../../../net/socket.c:182:35: warning: zero-length gnu_printf format string [-Wformat-zero-length]
  182 |         qemu_set_info_str(&s->nc, "");
      |                                   ^~
../../../net/stream.c:170:35: warning: zero-length gnu_printf format string [-Wformat-zero-length]
  170 |         qemu_set_info_str(&s->nc, "");

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221126152507.283271-7-sw@weilnetz.de>
This commit is contained in:
Stefan Weil via 2022-11-26 16:25:07 +01:00 committed by Stefan Hajnoczi
parent ec09f22d01
commit ac14949821
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/net.h
View File

@ -177,7 +177,8 @@ ssize_t qemu_send_packet_async(NetClientState *nc, const uint8_t *buf,
void qemu_purge_queued_packets(NetClientState *nc); void qemu_purge_queued_packets(NetClientState *nc);
void qemu_flush_queued_packets(NetClientState *nc); void qemu_flush_queued_packets(NetClientState *nc);
void qemu_flush_or_purge_queued_packets(NetClientState *nc, bool purge); void qemu_flush_or_purge_queued_packets(NetClientState *nc, bool purge);
void qemu_set_info_str(NetClientState *nc, const char *fmt, ...); void qemu_set_info_str(NetClientState *nc,
const char *fmt, ...) G_GNUC_PRINTF(2, 3);
void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6]); void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6]);
bool qemu_has_ufo(NetClientState *nc); bool qemu_has_ufo(NetClientState *nc);
bool qemu_has_vnet_hdr(NetClientState *nc); bool qemu_has_vnet_hdr(NetClientState *nc);

2
net/socket.c
View File

@ -179,7 +179,7 @@ static void net_socket_send(void *opaque)
s->fd = -1; s->fd = -1;
net_socket_rs_init(&s->rs, net_socket_rs_finalize, false); net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
s->nc.link_down = true; s->nc.link_down = true;
qemu_set_info_str(&s->nc, ""); qemu_set_info_str(&s->nc, "%s", "");
return; return;
} }

6
net/stream.c
View File

@ -167,7 +167,7 @@ static gboolean net_stream_send(QIOChannel *ioc,
net_socket_rs_init(&s->rs, net_stream_rs_finalize, false); net_socket_rs_init(&s->rs, net_stream_rs_finalize, false);
s->nc.link_down = true; s->nc.link_down = true;
qemu_set_info_str(&s->nc, ""); qemu_set_info_str(&s->nc, "%s", "");
qapi_event_send_netdev_stream_disconnected(s->nc.name); qapi_event_send_netdev_stream_disconnected(s->nc.name);
@ -245,7 +245,7 @@ static void net_stream_listen(QIONetListener *listener,
} }
g_assert(addr != NULL); g_assert(addr != NULL);
uri = socket_uri(addr); uri = socket_uri(addr);
qemu_set_info_str(&s->nc, uri); qemu_set_info_str(&s->nc, "%s", uri);
g_free(uri); g_free(uri);
qapi_event_send_netdev_stream_connected(s->nc.name, addr); qapi_event_send_netdev_stream_connected(s->nc.name, addr);
qapi_free_SocketAddress(addr); qapi_free_SocketAddress(addr);
@ -319,7 +319,7 @@ static void net_stream_client_connected(QIOTask *task, gpointer opaque)
addr = qio_channel_socket_get_remote_address(sioc, NULL); addr = qio_channel_socket_get_remote_address(sioc, NULL);
g_assert(addr != NULL); g_assert(addr != NULL);
uri = socket_uri(addr); uri = socket_uri(addr);
qemu_set_info_str(&s->nc, uri); qemu_set_info_str(&s->nc, "%s", uri);
g_free(uri); g_free(uri);
ret = qemu_socket_try_set_nonblock(sioc->fd); ret = qemu_socket_try_set_nonblock(sioc->fd);