Author: avg
Date: Wed Nov 20 10:59:41 2013
New Revision: 258377
URL: http://svnweb.freebsd.org/changeset/base/258377

Log:
  4088 use after free in arc_release()
  
  illumos/illumos-gate@ccc22e130479b5bd7c0002267fee1e0602d3f772

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c     Wed Nov 20 10:58:25 
2013        (r258376)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c     Wed Nov 20 10:59:41 
2013        (r258377)
@@ -3332,6 +3332,7 @@ arc_release(arc_buf_t *buf, void *tag)
        if (l2hdr) {
                mutex_enter(&l2arc_buflist_mtx);
                hdr->b_l2hdr = NULL;
+               list_remove(l2hdr->b_dev->l2ad_buflist, hdr);
        }
        buf_size = hdr->b_size;
 
@@ -3415,7 +3416,6 @@ arc_release(arc_buf_t *buf, void *tag)
 
        if (l2hdr) {
                ARCSTAT_INCR(arcstat_l2_asize, -l2hdr->b_asize);
-               list_remove(l2hdr->b_dev->l2ad_buflist, hdr);
                kmem_free(l2hdr, sizeof (l2arc_buf_hdr_t));
                ARCSTAT_INCR(arcstat_l2_size, -buf_size);
                mutex_exit(&l2arc_buflist_mtx);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to