From owner-svn-src-all@FreeBSD.ORG  Thu Mar  6 13:24:52 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 383DCC9C;
 Thu,  6 Mar 2014 13:24:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 24F27233;
 Thu,  6 Mar 2014 13:24:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26DOqWk005297;
 Thu, 6 Mar 2014 13:24:52 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26DOq4r005296;
 Thu, 6 Mar 2014 13:24:52 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201403061324.s26DOq4r005296@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 6 Mar 2014 13:24:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r262850 - stable/10/sys/dev/mps
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Thu, 06 Mar 2014 13:24:52 -0000

Author: mav
Date: Thu Mar  6 13:24:51 2014
New Revision: 262850
URL: http://svnweb.freebsd.org/changeset/base/262850

Log:
  MFC r262553:
  Pass proper pointer to bus_dmamem_free() in mps_iocfacts_free().
  
  Passing there pointer into the middle of allocated area caused kernel
  panic during reinit, for example, after firmware upgrade.

Modified:
  stable/10/sys/dev/mps/mps.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/mps/mps.c
==============================================================================
--- stable/10/sys/dev/mps/mps.c	Thu Mar  6 13:20:38 2014	(r262849)
+++ stable/10/sys/dev/mps/mps.c	Thu Mar  6 13:24:51 2014	(r262850)
@@ -617,8 +617,8 @@ mps_iocfacts_free(struct mps_softc *sc)
 
 	if (sc->post_busaddr != 0)
 		bus_dmamap_unload(sc->queues_dmat, sc->queues_map);
-	if (sc->post_queue != NULL)
-		bus_dmamem_free(sc->queues_dmat, sc->post_queue,
+	if (sc->free_queue != NULL)
+		bus_dmamem_free(sc->queues_dmat, sc->free_queue,
 		    sc->queues_map);
 	if (sc->queues_dmat != NULL)
 		bus_dma_tag_destroy(sc->queues_dmat);