Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Apr 2011 19:31:00 +0000 (UTC)
From:      Mikolaj Golub <trociny@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r220529 - stable/8/sys/geom/eli
Message-ID:  <201104101931.p3AJV00f057203@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: trociny
Date: Sun Apr 10 19:31:00 2011
New Revision: 220529
URL: http://svn.freebsd.org/changeset/base/220529

Log:
  MFC r220299:
  
  In g_eli_read_done() and g_eli_write_done(), for a bio with
  bio_children > 1, g_destroy_bio() is never called and the bio
  leaks. Fix this by calling g_destroy_bio() earlier, before the check.
  
  Submitted by:	Victor Balada Diaz <victor@bsdes.net> (initial version)
  
  Approved by:	pjd (mentor)

Modified:
  stable/8/sys/geom/eli/g_eli.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)

Modified: stable/8/sys/geom/eli/g_eli.c
==============================================================================
--- stable/8/sys/geom/eli/g_eli.c	Sun Apr 10 18:36:24 2011	(r220528)
+++ stable/8/sys/geom/eli/g_eli.c	Sun Apr 10 19:31:00 2011	(r220529)
@@ -160,13 +160,13 @@ g_eli_read_done(struct bio *bp)
 	pbp = bp->bio_parent;
 	if (pbp->bio_error == 0)
 		pbp->bio_error = bp->bio_error;
+	g_destroy_bio(bp);
 	/*
 	 * Do we have all sectors already?
 	 */
 	pbp->bio_inbed++;
 	if (pbp->bio_inbed < pbp->bio_children)
 		return;
-	g_destroy_bio(bp);
 	sc = pbp->bio_to->geom->softc;
 	if (pbp->bio_error != 0) {
 		G_ELI_LOGREQ(0, pbp, "%s() failed", __func__);
@@ -202,6 +202,7 @@ g_eli_write_done(struct bio *bp)
 		if (bp->bio_error != 0)
 			pbp->bio_error = bp->bio_error;
 	}
+	g_destroy_bio(bp);
 	/*
 	 * Do we have all sectors already?
 	 */
@@ -215,7 +216,6 @@ g_eli_write_done(struct bio *bp)
 		    pbp->bio_error);
 		pbp->bio_completed = 0;
 	}
-	g_destroy_bio(bp);
 	/*
 	 * Write is finished, send it up.
 	 */



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