From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1IFYxZ-0000aa-VA for user-mode-linux-devel@lists.sourceforge.net; Mon, 30 Jul 2007 10:23:11 -0700 Received: from [198.99.130.12] (helo=saraswathi.solana.com) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1IFYkG-0006gK-9f for user-mode-linux-devel@lists.sourceforge.net; Mon, 30 Jul 2007 10:09:24 -0700 Date: Mon, 30 Jul 2007 13:09:13 -0400 From: Jeff Dike Message-ID: <20070730170913.GA7697@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Disposition: inline Subject: [uml-devel] [PATCH 3/4] UML - Fix error cleanup ordering List-Id: The user-mode Linux development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: user-mode-linux-devel-bounces@lists.sourceforge.net Errors-To: user-mode-linux-devel-bounces@lists.sourceforge.net To: Andrew Morton Cc: LKML , uml-devel I messed up the error cleanup ordering in the console port driver. Signed-off-by: Jeff Dike -- arch/um/drivers/port_kern.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.21-mm/arch/um/drivers/port_kern.c =================================================================== --- linux-2.6.21-mm.orig/arch/um/drivers/port_kern.c 2007-07-27 11:56:14.000000000 -0400 +++ linux-2.6.21-mm/arch/um/drivers/port_kern.c 2007-07-27 11:57:07.000000000 -0400 @@ -216,10 +216,10 @@ void *port_data(int port_num) .telnetd_pid = -1 }); goto out; - out_free: - kfree(port); out_close: os_close_file(fd); + out_free: + kfree(port); out: up(&ports_sem); return dev; ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966508AbXG3RK2 (ORCPT ); Mon, 30 Jul 2007 13:10:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S967048AbXG3RJo (ORCPT ); Mon, 30 Jul 2007 13:09:44 -0400 Received: from saraswathi.solana.com ([198.99.130.12]:37199 "EHLO saraswathi.solana.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966996AbXG3RJm (ORCPT ); Mon, 30 Jul 2007 13:09:42 -0400 Date: Mon, 30 Jul 2007 13:09:13 -0400 From: Jeff Dike To: Andrew Morton Cc: LKML , uml-devel Subject: [PATCH 3/4] UML - Fix error cleanup ordering Message-ID: <20070730170913.GA7697@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org I messed up the error cleanup ordering in the console port driver. Signed-off-by: Jeff Dike -- arch/um/drivers/port_kern.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.21-mm/arch/um/drivers/port_kern.c =================================================================== --- linux-2.6.21-mm.orig/arch/um/drivers/port_kern.c 2007-07-27 11:56:14.000000000 -0400 +++ linux-2.6.21-mm/arch/um/drivers/port_kern.c 2007-07-27 11:57:07.000000000 -0400 @@ -216,10 +216,10 @@ void *port_data(int port_num) .telnetd_pid = -1 }); goto out; - out_free: - kfree(port); out_close: os_close_file(fd); + out_free: + kfree(port); out: up(&ports_sem); return dev;