From owner-svn-src-stable@FreeBSD.ORG  Fri Jul 16 09:08:16 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ACC16106566C;
	Fri, 16 Jul 2010 09:08:16 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B6F18FC14;
	Fri, 16 Jul 2010 09:08:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6G98GHC061750;
	Fri, 16 Jul 2010 09:08:16 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6G98GL9061748;
	Fri, 16 Jul 2010 09:08:16 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201007160908.o6G98GL9061748@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 16 Jul 2010 09:08:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210162 - stable/8/sys/dev/ata/chipsets
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jul 2010 09:08:16 -0000

Author: mav
Date: Fri Jul 16 09:08:16 2010
New Revision: 210162
URL: http://svn.freebsd.org/changeset/base/210162

Log:
  MFC r208820:
  Fix use after free on error.

Modified:
  stable/8/sys/dev/ata/chipsets/ata-acerlabs.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/ata/chipsets/ata-acerlabs.c
==============================================================================
--- stable/8/sys/dev/ata/chipsets/ata-acerlabs.c	Fri Jul 16 06:35:17 2010	(r210161)
+++ stable/8/sys/dev/ata/chipsets/ata-acerlabs.c	Fri Jul 16 09:08:16 2010	(r210162)
@@ -133,6 +133,7 @@ ata_ali_chipinit(device_t dev)
 				bus_release_resource(dev, SYS_RES_IOPORT,
 				    PCIR_BAR(i), res->bars[i]);
 			free(res, M_TEMP);
+			return ENXIO;
 		}
 	}
 	ctlr->chipset_data = res;