From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id E2FEB20248 for ; Fri, 8 Mar 2019 20:45:46 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= D92Vbc5bka0EkWN+NjaEyGpzv8aF+pF0te+/r2x2BOZ65ls0yCGbC2VWjuNLX8Xc Wg4QYR1Fu7D5amvS/VcYSwzoB06FP73y+KGToxrQsl9o9jTPFeC2WDZzslMZ2PCs ClAh+44Es7uXOW+zB2uxGxENtziTCnQsXfnhZeUWakg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=gwG6mq QQFEVkm0ecishdNMdtNC8=; b=MB79POBSapMX8WsFYGhjYsb17+uGsqO75foq13 Gp6JkRJg1I68N97U/+eO9p8pJLq2Q1LC9e8oTbisq0UEl5OxZ7YeVacOp+BzzCWG PuBPB2N+QwJ5n1YVBg4/jcXmHF5+8YC9sydv9fZgFpzLy+s0kG1JiXcJGu9p9eMf 2HteU= Received: (qmail 19796 invoked by alias); 8 Mar 2019 20:45:42 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 19631 invoked by uid 89); 8 Mar 2019 20:45:20 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mx1.redhat.com Date: Fri, 08 Mar 2019 21:45:12 +0100 To: libc-alpha@sourceware.org Subject: [PATCH] nss_dns: More consistency in corrupt message handling in getnetby* User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-Id: <20190308204512.4EC1780DD6B5@oldenburg2.str.redhat.com> From: Florian Weimer If a parse error is encountered, fail with NO_RECOVERY and NSS_STATUS_UNAVAIL. 2019-03-08 Florian Weimer * resolv/nss_dns/dns-network.c (getanswer_r): Handle unparseable messages more consistently. diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c index 9c0082d270..68266d57c9 100644 --- a/resolv/nss_dns/dns-network.c +++ b/resolv/nss_dns/dns-network.c @@ -336,14 +336,11 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result, bp[0] = '\0'; if (n < 0) - break; + goto bad_message; cp += n; if (end_of_message - cp < 10) - { - __set_h_errno (NO_RECOVERY); - return NSS_STATUS_UNAVAIL; - } + goto bad_message; int type, class; GETSHORT (type, cp); @@ -352,10 +349,7 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result, uint16_t rdatalen; GETSHORT (rdatalen, cp); if (end_of_message - cp < rdatalen) - { - __set_h_errno (NO_RECOVERY); - return NSS_STATUS_UNAVAIL; - } + goto bad_message; if (class == C_IN && type == T_PTR) { @@ -370,13 +364,7 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result, } if (n < 0) - { - /* XXX What does this mean? The original form from bind - returns NULL. Incrementing cp has no effect in any case. - What should I return here. ??? */ - cp += n; - return NSS_STATUS_UNAVAIL; - } + goto bad_message; cp += rdatalen; if (alias_pointer + 2 < &net_data->aliases[MAX_NR_ALIASES]) {