From owner-svn-src-stable-9@FreeBSD.ORG Tue Oct 16 01:37:18 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 69A08BFA; Tue, 16 Oct 2012 01:37:18 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4F5978FC08; Tue, 16 Oct 2012 01:37:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9G1bIsn016749; Tue, 16 Oct 2012 01:37:18 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9G1bIWm016746; Tue, 16 Oct 2012 01:37:18 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201210160137.q9G1bIWm016746@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Tue, 16 Oct 2012 01:37:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r241601 - in stable/9: lib/libc/rpc sys/rpc X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Oct 2012 01:37:18 -0000 Author: pfg Date: Tue Oct 16 01:37:17 2012 New Revision: 241601 URL: http://svn.freebsd.org/changeset/base/241601 Log: MFC r241143: rpc: be sure to free cl_netid and cl_tp. When creating a client with clnt_tli_create, it uses strdup to copy strings for these fields if nconf is passed in. clnt_dg_destroy frees these strings already. Make sure clnt_vc_destroy frees them in the same way. Tested by: David Wolfskill Obtained from: Bull GNU/Linux NFSv4 Project (libtirpc) Modified: stable/9/lib/libc/rpc/clnt_vc.c stable/9/sys/rpc/clnt_vc.c Modified: stable/9/lib/libc/rpc/clnt_vc.c ============================================================================== --- stable/9/lib/libc/rpc/clnt_vc.c Tue Oct 16 01:10:43 2012 (r241600) +++ stable/9/lib/libc/rpc/clnt_vc.c Tue Oct 16 01:37:17 2012 (r241601) @@ -672,6 +672,10 @@ clnt_vc_destroy(cl) if (ct->ct_addr.buf) free(ct->ct_addr.buf); mem_free(ct, sizeof(struct ct_data)); + if (cl->cl_netid && cl->cl_netid[0]) + mem_free(cl->cl_netid, strlen(cl->cl_netid) +1); + if (cl->cl_tp && cl->cl_tp[0]) + mem_free(cl->cl_tp, strlen(cl->cl_tp) +1); mem_free(cl, sizeof(CLIENT)); mutex_unlock(&clnt_fd_lock); thr_sigsetmask(SIG_SETMASK, &(mask), NULL); Modified: stable/9/sys/rpc/clnt_vc.c ============================================================================== --- stable/9/sys/rpc/clnt_vc.c Tue Oct 16 01:10:43 2012 (r241600) +++ stable/9/sys/rpc/clnt_vc.c Tue Oct 16 01:37:17 2012 (r241601) @@ -836,6 +836,10 @@ clnt_vc_destroy(CLIENT *cl) soclose(so); } mem_free(ct, sizeof(struct ct_data)); + if (cl->cl_netid && cl->cl_netid[0]) + mem_free(cl->cl_netid, strlen(cl->cl_netid) +1); + if (cl->cl_tp && cl->cl_tp[0]) + mem_free(cl->cl_tp, strlen(cl->cl_tp) +1); mem_free(cl, sizeof(CLIENT)); }