d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

8856 arc_cksum_is_equal() doesn't take into account ABD-logic

Browse Source 
illumos/illumos-gate@01a059ee0c

https://www.illumos.org/issues/8856:
arc_cksum_is_equal() calls zio_push_transform() that requires abd_t*
(second arg), but a void* is passed.

Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Author: Roman Strashkin <roman.strashkin@nexenta.com>
This commit is contained in:
Alexander Motin 2018-01-22 04:21:55 +00:00
parent 4c30fea809
commit 1536455b31
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
uts/common/fs/zfs/arc.c
View File

@ -23,7 +23,7 @@
* Copyright (c) 2012, Joyent, Inc. All rights reserved.
* Copyright (c) 2011, 2017 by Delphix. All rights reserved.
* Copyright (c) 2014 by Saso Kiselkov. All rights reserved.
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
* Copyright 2017 Nexenta Systems, Inc. All rights reserved.
*/
/*
@ -1547,8 +1547,9 @@ arc_cksum_is_equal(arc_buf_hdr_t *hdr, zio_t *zio)
uint64_t lsize = HDR_GET_LSIZE(hdr);
uint64_t csize;
void *cbuf = zio_buf_alloc(HDR_GET_PSIZE(hdr));
csize = zio_compress_data(compress, zio->io_abd, cbuf, lsize);
abd_t *cdata = abd_alloc_linear(HDR_GET_PSIZE(hdr), B_TRUE);
csize = zio_compress_data(compress, zio->io_abd,
abd_to_buf(cdata), lsize);
ASSERT3U(csize, <=, HDR_GET_PSIZE(hdr));
if (csize < HDR_GET_PSIZE(hdr)) {
@ -1564,10 +1565,10 @@ arc_cksum_is_equal(arc_buf_hdr_t *hdr, zio_t *zio)
* and zero out any part that should not contain
* data.
*/
bzero((char *)cbuf + csize, HDR_GET_PSIZE(hdr) - csize);
abd_zero_off(cdata, csize, HDR_GET_PSIZE(hdr) - csize);
csize = HDR_GET_PSIZE(hdr);
}
zio_push_transform(zio, cbuf, csize, HDR_GET_PSIZE(hdr), NULL);
zio_push_transform(zio, cdata, csize, HDR_GET_PSIZE(hdr), NULL);
}
/*