From patchwork Sun May 11 21:30:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 347832 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 75B82140083 for ; Mon, 12 May 2014 07:30:23 +1000 (EST) Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s4BLUKjO028665 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 11 May 2014 21:30:21 GMT Received: from oss.oracle.com (oss-external.oracle.com [137.254.96.51]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s4BLUJtL003783 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 11 May 2014 21:30:20 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1WjbK7-0004GO-OK; Sun, 11 May 2014 14:30:19 -0700 Received: from ucsinet21.oracle.com ([156.151.31.93]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1WjbK2-0004G2-TY for fedfs-utils-devel@oss.oracle.com; Sun, 11 May 2014 14:30:15 -0700 Received: from aserp1030.oracle.com (aserp1030.oracle.com [141.146.126.68]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s4BLUEsF000972 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 11 May 2014 21:30:14 GMT Received: from mail-ig0-f180.google.com (mail-ig0-f180.google.com [209.85.213.180]) by aserp1030.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s4BLUDI1027529 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=OK) for ; Sun, 11 May 2014 21:30:13 GMT Authentication-Results: aserp1030.oracle.com; dkim=pass reason="2048-bit key" header.d=gmail.com header.i=@gmail.com header.b=bbxBwLRj Received: by mail-ig0-f180.google.com with SMTP id c1so3109255igq.1 for ; Sun, 11 May 2014 14:30:12 -0700 (PDT) X-Received: by 10.50.92.42 with SMTP id cj10mr36764091igb.34.1399843812808; Sun, 11 May 2014 14:30:12 -0700 (PDT) Received: from seurat.1015granger.net ([2604:8800:100:81fc:20c:29ff:fe44:ec31]) by mx.google.com with ESMTPSA id qh3sm16881505igb.17.2014.05.11.14.30.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 May 2014 14:30:12 -0700 (PDT) To: fedfs-utils-devel@oss.oracle.com From: Chuck Lever Date: Sun, 11 May 2014 17:30:11 -0400 Message-ID: <20140511213011.13852.95437.stgit@seurat.1015granger.net> In-Reply-To: <20140511212416.13852.92639.stgit@seurat.1015granger.net> References: <20140511212416.13852.92639.stgit@seurat.1015granger.net> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Flow-Control-Info: class=Pass-to-MM reputation=ipRisk-All ip=209.85.213.180 ct-class=R5 ct-vol1=-98 ct-vol2=8 ct-vol3=7 ct-risk=50 ct-spam1=81 ct-spam2=7 ct-bulk=6 rcpts=1 size=920 X-Sendmail-CM-Score: 0.00% X-Sendmail-CM-Analysis: v=2.1 cv=IYq+Bwaa c=1 sm=1 tr=0 a=9zjvAxY1YOi6wZYuJazVXA==:117 a=dzsqy3y4QnMA:10 a=0ZO8Xjbm5AIA:10 a=dPGociXpb70A:10 a=IkcTkHD0fZMA:10 a=xqWC_Br6kY4A:10 a=yPCof4ZbAAAA:8 a=Lb1rMZzfAAAA:8 a=1XWaLZrsAAAA:8 a=YLw-BQDm1JqqmcLBBmcA:9 a=QEXdDO 2ut3YA:10 a=7DSvI1NPTFQA:10 X-Sendmail-CT-RefID: str=0001.0A090205.536FEBE5.007D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-Sendmail-CT-Classification: not spam Subject: [fedfs-utils] [PATCH 15/17] libnsdb: Fix NULL pointer dereference in nsdb_get_naming_contexts() X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: acsinet21.oracle.com [141.146.126.237] Fixes: 86a3b2e65ba419aee73f75181cd247210a15683d Signed-off-by: Chuck Lever --- src/libnsdb/fileserver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libnsdb/fileserver.c b/src/libnsdb/fileserver.c index cffea59..965f1a1 100644 --- a/src/libnsdb/fileserver.c +++ b/src/libnsdb/fileserver.c @@ -704,10 +704,10 @@ FedFsStatus nsdb_get_naming_contexts_s(nsdb_t host, char ***contexts) { LDAPMessage *response, *message; - LDAP *ld = host->fn_ldap; FedFsStatus retval; int entries; char **tmp; + LDAP *ld; if (host == NULL) return FEDFS_ERR_INVAL; @@ -718,6 +718,7 @@ nsdb_get_naming_contexts_s(nsdb_t host, char ***contexts) if (contexts == NULL) return FEDFS_ERR_INVAL; + ld = host->fn_ldap; host->fn_ldaperr = nsdb_search_nsdb_attr_s(ld, LDAP_ROOT_DSE, "(objectClass=*)", "namingContexts",