From patchwork Tue Jun 3 23:36:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 355673 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 56B5D140091 for ; Wed, 4 Jun 2014 09:37:10 +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:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=k79Zp2Nzg8vfTFeY/ySTX/Ic+DsRTRw cA4TRzChoCvphIQwUDJXI3egFPf8Sg+6IUv/MppKVYBz7ezyoarFInc6DigPn1UK NyqhUB3WI2FhOkHGbFN5BOCpikg/QxLwpNbSE/xm3fjVrpmwnLR8j1rfptM3XkOo lXQ+tCDSRdC0= 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:cc:subject:date:message-id:in-reply-to :references; s=default; bh=orqP5bCad10HyFhhTNoQrpWA9X4=; b=UQTA+ O1M8uxwGc01siMpDBWt4KHV76PfDsNsa7BDVGefFk07wvxT7/PCmFlLJ+ONpEnaS X0Xed2u1d2xI1Snm7oNhm+4Q7XV4DlkksYKSvBIjAmEr5T60Cm4qnbGS1udlGrxt r8ozYGHCXKUy2dvfQdk6ikaupKpgas/A1+/Jxk= Received: (qmail 10030 invoked by alias); 3 Jun 2014 23:36:55 -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 10001 invoked by uid 89); 3 Jun 2014 23:36:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: hall.aurel32.net From: Aurelien Jarno To: libc-alpha@sourceware.org Cc: Aurelien Jarno Subject: [RFC PATCH 2/4] resolv: fix nsaddr_list array indexing Date: Wed, 4 Jun 2014 01:36:41 +0200 Message-Id: <1401838603-22101-3-git-send-email-aurelien@aurel32.net> In-Reply-To: <1401838603-22101-1-git-send-email-aurelien@aurel32.net> References: <1401838603-22101-1-git-send-email-aurelien@aurel32.net> This commit is basically a revert of commits 6f5c3117 and 16b7dc27. Those commits changed the indexing of nsaddr_list array when reading resolv.conf, with the goal to simplify the mapping between the nsaddr_list and nsaddrs, by making sure we don't have any nameserver at the same both arrays. However the code in __libc_res_nsend hasn't been updated, and still assume that all nsaddr_list entries are located at the beginning of the array, without any gap. This causes some issues when IPv6 nameservers are in use. --- resolv/res_init.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resolv/res_init.c b/resolv/res_init.c index bdec4d9..37004ab 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -308,9 +308,9 @@ __res_vinit(res_state statp, int preinit) { cp++; if ((*cp != '\0') && (*cp != '\n') && __inet_aton(cp, &a)) { - statp->nsaddr_list[nservall].sin_addr = a; - statp->nsaddr_list[nservall].sin_family = AF_INET; - statp->nsaddr_list[nservall].sin_port = + statp->nsaddr_list[nserv].sin_addr = a; + statp->nsaddr_list[nserv].sin_family = AF_INET; + statp->nsaddr_list[nserv].sin_port = htons(NAMESERVER_PORT); nserv++; #ifdef _LIBC @@ -414,7 +414,7 @@ __res_vinit(res_state statp, int preinit) { continue; } } - statp->nscount = nservall; + statp->nscount = nserv; #ifdef _LIBC if (nservall - nserv > 0) { statp->_u._ext.nscount6 = nservall - nserv;