Author: avg
Date: Wed Nov 20 11:52:32 2013
New Revision: 258389
URL: http://svnweb.freebsd.org/changeset/base/258389
Log:
MFV r258378: 4089 NULL pointer dereference in arc_read()
illumos/illumos-gate@57815f6b95a743697e148327725b7f568e75e6ea
Tested by: adrian
MFC after: 4 days
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
head/sys/cddl/contrib/opensolaris/ (props changed)
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Wed Nov 20
11:47:50 2013 (r258388)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Wed Nov 20
11:52:32 2013 (r258389)
@@ -20,9 +20,9 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2013 by Delphix. All rights reserved.
* Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
+ * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
*/
/*
@@ -3173,6 +3173,8 @@ top:
vdev_t *vd = NULL;
uint64_t addr = 0;
boolean_t devw = B_FALSE;
+ enum zio_compress b_compress = ZIO_COMPRESS_OFF;
+ uint64_t b_asize = 0;
if (hdr == NULL) {
/* this block is not in the cache */
@@ -3242,10 +3244,12 @@ top:
hdr->b_acb = acb;
hdr->b_flags |= ARC_IO_IN_PROGRESS;
- if (HDR_L2CACHE(hdr) && hdr->b_l2hdr != NULL &&
+ if (hdr->b_l2hdr != NULL &&
(vd = hdr->b_l2hdr->b_dev->l2ad_vdev) != NULL) {
devw = hdr->b_l2hdr->b_dev->l2ad_writing;
addr = hdr->b_l2hdr->b_daddr;
+ b_compress = hdr->b_l2hdr->b_compress;
+ b_asize = hdr->b_l2hdr->b_asize;
/*
* Lock out device removal.
*/
@@ -3296,7 +3300,7 @@ top:
cb->l2rcb_bp = *bp;
cb->l2rcb_zb = *zb;
cb->l2rcb_flags = zio_flags;
- cb->l2rcb_compress = hdr->b_l2hdr->b_compress;
+ cb->l2rcb_compress = b_compress;
ASSERT(addr >= VDEV_LABEL_START_SIZE &&
addr + size < vd->vdev_psize -
@@ -3308,8 +3312,7 @@ top:
* Issue a null zio if the underlying buffer
* was squashed to zero size by compression.
*/
- if (hdr->b_l2hdr->b_compress ==
- ZIO_COMPRESS_EMPTY) {
+ if (b_compress == ZIO_COMPRESS_EMPTY) {
rzio = zio_null(pio, spa, vd,
l2arc_read_done, cb,
zio_flags | ZIO_FLAG_DONT_CACHE |
@@ -3318,8 +3321,8 @@ top:
ZIO_FLAG_DONT_RETRY);
} else {
rzio = zio_read_phys(pio, vd, addr,
- hdr->b_l2hdr->b_asize,
- buf->b_data, ZIO_CHECKSUM_OFF,
+ b_asize, buf->b_data,
+ ZIO_CHECKSUM_OFF,
l2arc_read_done, cb, priority,
zio_flags | ZIO_FLAG_DONT_CACHE |
ZIO_FLAG_CANFAIL |
@@ -3328,8 +3331,7 @@ top:
}
DTRACE_PROBE2(l2arc__read, vdev_t *, vd,
zio_t *, rzio);
- ARCSTAT_INCR(arcstat_l2_read_bytes,
- hdr->b_l2hdr->b_asize);
+ ARCSTAT_INCR(arcstat_l2_read_bytes, b_asize);
if (*arc_flags & ARC_NOWAIT) {
zio_nowait(rzio);
_______________________________________________
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"
