On 13 November 2017 at 07:13, Jason Wang <jasow...@redhat.com> wrote: > > > On 2017年11月06日 21:28, Jens Freimann wrote: >> >> This fixes coverity issue CID1005339. >> >> Make sure that saddr is not used uninitialized if the >> mcast parameter is NULL. >> >> Cc: qemu-sta...@nongnu.org >> Reported-by: Peter Maydell <peter.mayd...@linaro.org> >> Signed-off-by: Jens Freimann <jfreim...@redhat.com> >> --- >> net/socket.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/net/socket.c b/net/socket.c >> index e6b471c63d..51eaea67a0 100644 >> --- a/net/socket.c >> +++ b/net/socket.c >> @@ -332,7 +332,7 @@ static NetSocketState >> *net_socket_fd_init_dgram(NetClientState *peer, >> const char *mcast, >> Error **errp) >> { >> - struct sockaddr_in saddr; >> + struct sockaddr_in saddr = { 0 }; >> int newfd; >> NetClientState *nc; >> NetSocketState *s; >> @@ -373,7 +373,7 @@ static NetSocketState >> *net_socket_fd_init_dgram(NetClientState *peer, >> net_socket_read_poll(s, true); >> /* mcast: save bound address as dst */ >> - if (is_connected) { >> + if (is_connected && mcast != NULL) { >> s->dgram_dst = saddr; >> snprintf(nc->info_str, sizeof(nc->info_str), >> "socket: fd=%d (cloned mcast=%s:%d)", > > > Applied, thanks.
Er, this version didn't pass code review and you should apply v2 instead... thanks -- PMM