From owner-p4-projects@FreeBSD.ORG Thu Jul 13 17:53:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D27A16A4E7; Thu, 13 Jul 2006 17:53:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F2CCF16A4E5 for ; Thu, 13 Jul 2006 17:53:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF77D43D45 for ; Thu, 13 Jul 2006 17:53:32 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6DHrWvT056679 for ; Thu, 13 Jul 2006 17:53:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6DHrWLq056676 for perforce@freebsd.org; Thu, 13 Jul 2006 17:53:32 GMT (envelope-from jhb@freebsd.org) Date: Thu, 13 Jul 2006 17:53:32 GMT Message-Id: <200607131753.k6DHrWLq056676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 101483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jul 2006 17:53:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=101483 Change 101483 by jhb@jhb_mutex on 2006/07/13 17:53:11 Move free() of sa out of kern_connect(). Affected files ... .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#34 edit .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#89 edit Differences ... ==== //depot/projects/smpng/sys/compat/linux/linux_socket.c#34 (text+ko) ==== @@ -640,6 +640,7 @@ return (error); error = kern_connect(td, linux_args.s, sa); + free(sa, M_SONAME); if (error != EISCONN) return (error); ==== //depot/projects/smpng/sys/kern/uipc_syscalls.c#89 (text+ko) ==== @@ -535,7 +535,9 @@ if (error) return (error); - return (kern_connect(td, uap->s, sa)); + error = kern_connect(td, uap->s, sa); + free(sa, M_SONAME); + return (error); } @@ -597,7 +599,6 @@ fdrop(fp, td); done2: NET_UNLOCK_GIANT(); - FREE(sa, M_SONAME); return (error); }