From owner-cvs-all@FreeBSD.ORG Sat Mar 25 15:03:30 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57A5316A401; Sat, 25 Mar 2006 15:03:30 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA30143D67; Sat, 25 Mar 2006 15:03:29 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2PF3TGu000255; Sat, 25 Mar 2006 15:03:29 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2PF3T9s000254; Sat, 25 Mar 2006 15:03:29 GMT (envelope-from rwatson) Message-Id: <200603251503.k2PF3T9s000254@repoman.freebsd.org> From: Robert Watson Date: Sat, 25 Mar 2006 15:03:29 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/netipx spx_usrreq.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Mar 2006 15:03:30 -0000 rwatson 2006-03-25 15:03:29 UTC FreeBSD src repository Modified files: sys/netipx spx_usrreq.c Log: Restructure spx_attach() to properly free memory in the event that one of its allocations fails. Allocate the ipxp last so as to avoid having to free it if another allocation goes wrong. Normalize retrieval of ipxp and cb from socket in spx_sp_attach(), and add assertions. MFC after: 1 month Revision Changes Path 1.75 +32 -21 src/sys/netipx/spx_usrreq.c