From patchwork Wed May 7 10:11:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 346491 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 4B40E140216 for ; Wed, 7 May 2014 20:12:08 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type; q=dns; s=default; b=WPqAukaQGC4t8u+r4GUrCZ/8yekDI lMdwgUM6K01oCxNBmb0rr+/fieGNji7ras7yRDDWyFntRthlivc7yUfBPToJafhh EP/+RjifTvE1Uy2FzmP5aHEiKQrSEWnkX/ftEgUI+VrQRo6zNNKb8ErEyYx9zOUj Lb8WnBPb8uEtTQ= 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:from:to:subject:date:message-id:mime-version :content-type; s=default; bh=tuko5bd/sxfOwaZXPdOn+Bs+0oA=; b=B6l nFc9u8Chl9lUl/F0MEAOpPYHcQ2/n9nG8vKLYqh41p+NfGl1CMeubH7vbDXDSp27 6/zEXdr0ZQC0idp+VFChG83DlWPN71TcXFOazL/JOpxwGH6/CkJwYh3JUT4IfNRS khgGgqBtM/d+dWUDG2XD5DgdwgFm9x+Cir2t3Kr4= Received: (qmail 4277 invoked by alias); 7 May 2014 10:12:02 -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 Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 4259 invoked by uid 89); 7 May 2014 10:12:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx2.suse.de From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] Fix parsing of getai result from nscd X-Yow: DIDI... is that a MARTIAN name, or, are we in ISRAEL? Date: Wed, 07 May 2014 12:11:56 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 With nscd running, getaddrinfo misparses the getai result from nscd if an IPv6-only result was requested. Andreas. * sysdeps/posix/getaddrinfo.c (gaih_inet): Advance address pointer when skipping over non-matching result from nscd. --- sysdeps/posix/getaddrinfo.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 3385bed..6258330 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -710,16 +710,20 @@ gaih_inet (const char *name, const struct gaih_service *service, struct gaih_addrtuple *addrfree = addrmem; for (int i = 0; i < air->naddrs; ++i) { + socklen_t size = (air->family[i] == AF_INET + ? INADDRSZ : IN6ADDRSZ); + if (!((air->family[i] == AF_INET && req->ai_family == AF_INET6 && (req->ai_flags & AI_V4MAPPED) != 0) || req->ai_family == AF_UNSPEC || air->family[i] == req->ai_family)) - /* Skip over non-matching result. */ - continue; + { + /* Skip over non-matching result. */ + addrs += size; + continue; + } - socklen_t size = (air->family[i] == AF_INET - ? INADDRSZ : IN6ADDRSZ); if (*pat == NULL) { *pat = addrfree++;