From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 8EBBE394B01A for ; Mon, 9 May 2022 21:11:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8EBBE394B01A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from reform (deer0x07.wildebeest.org [172.31.17.137]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 43F503000599; Mon, 9 May 2022 23:11:05 +0200 (CEST) Received: by reform (Postfix, from userid 1000) id EA2D62E82D76; Mon, 9 May 2022 23:11:04 +0200 (CEST) From: Mark Wielaard To: elfutils-devel@sourceware.org Cc: Mark Wielaard Subject: [PATCH] debuginfod: Always request servname from getnameinfo for conninfo. Date: Mon, 9 May 2022 23:10:44 +0200 Message-Id: <20220509211044.54967-1-mark@klomp.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 May 2022 21:11:08 -0000 When getting the connection info getnameinfo is called getting the hostname and servname except when the sockaddr is a pure ipv6 address. In that last case only hostname is requested. Since servname is stack allocated and not initialized it might contain garbage which is then put in the log. Just always request both hostname and servname with NI_NUMERICHOST | NI_NUMERICSERV. Signed-off-by: Mark Wielaard --- debuginfod/ChangeLog | 4 ++++ debuginfod/debuginfod.cxx | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog index 983fd44a..257ac39f 100644 --- a/debuginfod/ChangeLog +++ b/debuginfod/ChangeLog @@ -1,3 +1,7 @@ +2022-05-09 Mark Wielaard + + * debuginfod.cxx (conninfo): Always provide servname to getnameinfo. + 2022-05-09 Mark Wielaard * debuginfod-client.c (debuginfod_query_server): Add diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx index 4aaf41c0..b664b74e 100644 --- a/debuginfod/debuginfod.cxx +++ b/debuginfod/debuginfod.cxx @@ -1060,8 +1060,10 @@ conninfo (struct MHD_Connection * conn) struct sockaddr *so = u ? u->client_addr : 0; if (so && so->sa_family == AF_INET) { - sts = getnameinfo (so, sizeof (struct sockaddr_in), hostname, sizeof (hostname), servname, - sizeof (servname), NI_NUMERICHOST | NI_NUMERICSERV); + sts = getnameinfo (so, sizeof (struct sockaddr_in), + hostname, sizeof (hostname), + servname, sizeof (servname), + NI_NUMERICHOST | NI_NUMERICSERV); } else if (so && so->sa_family == AF_INET6) { struct sockaddr_in6* addr6 = (struct sockaddr_in6*) so; if (IN6_IS_ADDR_V4MAPPED(&addr6->sin6_addr)) { @@ -1071,11 +1073,14 @@ conninfo (struct MHD_Connection * conn) addr4.sin_port = addr6->sin6_port; memcpy (&addr4.sin_addr.s_addr, addr6->sin6_addr.s6_addr+12, sizeof(addr4.sin_addr.s_addr)); sts = getnameinfo ((struct sockaddr*) &addr4, sizeof (addr4), - hostname, sizeof (hostname), servname, sizeof (servname), + hostname, sizeof (hostname), + servname, sizeof (servname), NI_NUMERICHOST | NI_NUMERICSERV); } else { - sts = getnameinfo (so, sizeof (struct sockaddr_in6), hostname, sizeof (hostname), NULL, 0, - NI_NUMERICHOST); + sts = getnameinfo (so, sizeof (struct sockaddr_in6), + hostname, sizeof (hostname), + servname, sizeof (servname), + NI_NUMERICHOST | NI_NUMERICSERV); } } -- 2.30.2