From owner-svn-src-all@FreeBSD.ORG  Wed Aug  3 09:56:00 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1B585106564A;
	Wed,  3 Aug 2011 09:56:00 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B4D58FC19;
	Wed,  3 Aug 2011 09:56:00 +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 p739txZA096068;
	Wed, 3 Aug 2011 09:55:59 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p739tx8n096066;
	Wed, 3 Aug 2011 09:55:59 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201108030955.p739tx8n096066@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 3 Aug 2011 09:55:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224632 - head/lib/libproc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Aug 2011 09:56:00 -0000

Author: avg
Date: Wed Aug  3 09:55:59 2011
New Revision: 224632
URL: http://svn.freebsd.org/changeset/base/224632

Log:
  fix a serious bug in libproc's proc_attach
  
  proc_attach always frees any struct proc_handle data
  that it allocates, but that is supposed to be done
  only in error conditions.
  
  PR:		bin/158431
  Approved by:	re (kib)
  MFC after:	1 week

Modified:
  head/lib/libproc/proc_create.c

Modified: head/lib/libproc/proc_create.c
==============================================================================
--- head/lib/libproc/proc_create.c	Wed Aug  3 09:42:48 2011	(r224631)
+++ head/lib/libproc/proc_create.c	Wed Aug  3 09:55:59 2011	(r224632)
@@ -79,12 +79,11 @@ proc_attach(pid_t pid, int flags, struct
 	else
 		phdl->status = PS_STOP;
 
+out:
 	if (error)
 		proc_free(phdl);
 	else
 		*pphdl = phdl;
-out:
-	proc_free(phdl);
 	return (error);
 }