From patchwork Thu Apr 30 10:52:02 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 134254 X-Patchwork-Delegate: carlos@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 20C824BA79A6 for ; Thu, 30 Apr 2026 10:54:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 20C824BA79A6 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=N0RUtAAg X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id 917C5436F7EF for ; Thu, 30 Apr 2026 10:52:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 917C5436F7EF Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 917C5436F7EF Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777546328; cv=none; b=FdHwhjQ5mz/bcyIZWNosBMw+H6/8XBTXbYKD6lcwzz9aiWbHAkbJxj2L11KglnjgdbTvfHzwhRnXHliwULIRz3OoUJGMqS0V5LwVr3h9XifrIX26pfEJ0q0b6ROlsA2/+dAzowozUMAvtqVUxijbVwE1iUtdNnoKTD9nX1diH4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777546328; c=relaxed/simple; bh=wjk/nEc4TJWroMTOR/qaFDwloBD8v8vuuiN7aCviLNU=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=i/KOJB07fHbcg7Bu+Y6B5s3ws3/auotPKgjahKv19v2TM/pG82BAleRP6IcY7cv5nkHkAs8/80lxIqPJepjVqkRcctaff6w1FVdymRhI0xEvlRawlPWxb4eY5gN6LBlbMvV39krsacin7v22Mwn3SvyWlq9MV0+NaqlLQRaP280= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 917C5436F7EF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777546328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=lHWtMpvWjCDIPI01DojkTCNfZY7uGetdZ17gjLoRjfw=; b=N0RUtAAgZHUlO5J5tL9HeN4Wj/0GEsis8VaLz6vHwQBb7cE3luOqnakcTmCiwvXzG/NhGV bXQnrY3PfnqrlMMp5OS5RIEyFeqZVKBhCRKm2UIZWg8WGRTo7oSN9xLbAIFn1PRQ1x5WhO +a5jCWKGeHSqgEB8dDq9Z7QPksk4Jg4= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-91-MlLrzIKQOIqbRP4adC5I-Q-1; Thu, 30 Apr 2026 06:52:07 -0400 X-MC-Unique: MlLrzIKQOIqbRP4adC5I-Q-1 X-Mimecast-MFC-AGG-ID: MlLrzIKQOIqbRP4adC5I-Q_1777546326 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 35BBB195609E for ; Thu, 30 Apr 2026 10:52:06 +0000 (UTC) Received: from fweimer-oldenburg.csb.redhat.com (unknown [10.44.48.4]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8019D19560AB for ; Thu, 30 Apr 2026 10:52:04 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 2/5] resolv: Check for inet_ntop failure in ns_sprintrrf In-Reply-To: Message-ID: References: X-From-Line: fd53342fd0764dc033664d47f1e0e391cebfbbe5 Mon Sep 17 00:00:00 2001 Date: Thu, 30 Apr 2026 12:52:02 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: U0DuafxFxyjkhnuCXtq9anngMPakwpvfSq8zmSwItbY_1777546326 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL_CSS, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org This makes the output more consistent (either failure or complete output) and helps with systematic testing with varying buffer sizes. --- resolv/ns_print.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/resolv/ns_print.c b/resolv/ns_print.c index cef2212fd2..5701e3d0c5 100644 --- a/resolv/ns_print.c +++ b/resolv/ns_print.c @@ -141,7 +141,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen, case ns_t_a: if (rdlen != (size_t)NS_INADDRSZ) goto formerr; - (void) inet_ntop(AF_INET, rdata, buf, buflen); + if (inet_ntop (AF_INET, rdata, buf, buflen) == NULL) + return -1; addlen(strlen(buf), &buf, &buflen); break; @@ -308,10 +309,11 @@ ns_sprintrrf(const u_char *msg, size_t msglen, case ns_t_aaaa: if (rdlen != (size_t)NS_IN6ADDRSZ) - goto formerr; - (void) inet_ntop(AF_INET6, rdata, buf, buflen); - addlen(strlen(buf), &buf, &buflen); - break; + goto formerr; + if (inet_ntop (AF_INET6, rdata, buf, buflen) == NULL) + return -1; + addlen(strlen(buf), &buf, &buflen); + break; case ns_t_loc: { char t[255]; @@ -400,7 +402,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen, goto formerr; /* Address. */ - (void) inet_ntop(AF_INET, rdata, buf, buflen); + if (inet_ntop (AF_INET, rdata, buf, buflen) == NULL) + return -1; addlen(strlen(buf), &buf, &buflen); rdata += NS_INADDRSZ; @@ -542,7 +545,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen, if (rdata + pbyte >= edata) goto formerr; memset(&a, 0, sizeof(a)); memcpy(&a.s6_addr[pbyte], rdata, sizeof(a) - pbyte); - (void) inet_ntop(AF_INET6, &a, buf, buflen); + if (inet_ntop (AF_INET6, &a, buf, buflen) == NULL) + return -1; addlen(strlen(buf), &buf, &buflen); rdata += sizeof(a) - pbyte; }