Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Mar 2015 13:03:37 +0000 (UTC)
From:      Andrew Rybchenko <arybchik@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r280581 - stable/10/sys/dev/sfxge
Message-ID:  <201503251303.t2PD3b18064198@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arybchik
Date: Wed Mar 25 13:03:36 2015
New Revision: 280581
URL: https://svnweb.freebsd.org/changeset/base/280581

Log:
  MFC: 279176
  
  sfxge: pass correct address to free allocated memory in the case of load error
  
  It is one more place missed in the previous fix.
  Most likely is was just memory leak on the error handling path since
  typically efsys_mem_t is filled in by zeros on allocation.
  
  Sponsored by:   Solarflare Communications, Inc.
  Approved by:    gnn (mentor)

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

Modified: stable/10/sys/dev/sfxge/sfxge_dma.c
==============================================================================
--- stable/10/sys/dev/sfxge/sfxge_dma.c	Wed Mar 25 13:02:33 2015	(r280580)
+++ stable/10/sys/dev/sfxge/sfxge_dma.c	Wed Mar 25 13:03:36 2015	(r280581)
@@ -164,8 +164,8 @@ sfxge_dma_alloc(struct sfxge_softc *sc, 
 	 * wrong.
 	 */
 	if (esmp->esm_addr == 0) {
-		bus_dmamem_free(esmp->esm_tag, esmp->esm_base, esmp->esm_map);
-		bus_dma_tag_destroy(esmp->esm_tag);		
+		bus_dmamem_free(esmp->esm_tag, vaddr, esmp->esm_map);
+		bus_dma_tag_destroy(esmp->esm_tag);
 		return (ENOMEM);
 	}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503251303.t2PD3b18064198>