From: William Bowling Date: Fri, 1 Mar 2019 21:45:56 +0000 (+0000) Subject: slirp: check sscanf result when emulating ident X-Git-Tag: v3.0.1~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=690bb48e405c70853738f0947693970d927a8cab;p=thirdparty%2Fqemu.git slirp: check sscanf result when emulating ident When emulating ident in tcp_emu, if the strchr checks passed but the sscanf check failed, two uninitialized variables would be copied and sent in the reply, so move this code inside the if(sscanf()) clause. Signed-off-by: William Bowling Cc: qemu-stable@nongnu.org Cc: secalert@redhat.com Message-Id: <1551476756-25749-1-git-send-email-will@wbowling.info> Signed-off-by: Samuel Thibault Reviewed-by: Philippe Mathieu-Daudé (cherry picked from commit d3222975c7d6cda9e25809dea05241188457b113) Signed-off-by: Michael Roth --- diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index 8d0f94b75fc..473c8b04e66 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c @@ -662,12 +662,12 @@ tcp_emu(struct socket *so, struct mbuf *m) break; } } + so_rcv->sb_cc = snprintf(so_rcv->sb_data, + so_rcv->sb_datalen, + "%d,%d\r\n", n1, n2); + so_rcv->sb_rptr = so_rcv->sb_data; + so_rcv->sb_wptr = so_rcv->sb_data + so_rcv->sb_cc; } - so_rcv->sb_cc = snprintf(so_rcv->sb_data, - so_rcv->sb_datalen, - "%d,%d\r\n", n1, n2); - so_rcv->sb_rptr = so_rcv->sb_data; - so_rcv->sb_wptr = so_rcv->sb_data + so_rcv->sb_cc; } m_free(m); return 0;