summaryrefslogtreecommitdiffstats
path: root/include/gssapi
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2015-10-03 11:24:47 +0000
committermav <mav@FreeBSD.org>2015-10-03 11:24:47 +0000
commited042b97255da537760bb7d0429079a77a3b103e (patch)
tree536b380e5cf2abc572e306d2e7e3d92b54443626 /include/gssapi
parent3cfde751dc37cf5999e6d39b71945077cca5651f (diff)
downloadFreeBSD-src-ed042b97255da537760bb7d0429079a77a3b103e.zip
FreeBSD-src-ed042b97255da537760bb7d0429079a77a3b103e.tar.gz
MFC r287283 (by delphij):
Fix a buffer overrun which may lead to data corruption, introduced in r286951 by reinstating changes in r274628. In l2arc_compress_buf(), we allocate a buffer to stash away the compressed data in 'cdata', allocated of l2hdr->b_asize bytes. We then ask zio_compress_data() to compress the buffer, b_l1hdr.b_tmp_cdata, which is of l2hdr->b_asize bytes, and have the compressed size (or original size, if compress didn't gain enough) stored in csize. To pad the buffer to fit the optimal write size, we round up the compressed size to L2 device's vdev_ashift. Illumos code rounds up the size by at most SPA_MINBLOCKSIZE. Because we know csize <= b_asize, and b_asize is integer multiple of SPA_MINBLOCKSIZE, we are guaranteed that the rounded up csize would be <= b_asize. However, this is not necessarily true when we round up to 1 << vdev_ashift, because it could be larger than SPA_MINBLOCKSIZE. So, in the worst case scenario, we are overwriting at most (1 << vdev_ashift - SPA_MINBLOCKSIZE) bytes of memory next to the compressed data buffer. Andriy's original change in r274628 reorganized the code a little bit, by moving the padding to after we determined that the compression was beneficial. At which point, we would check rounded size against the allocated buffer size, and the buffer overrun would not be possible.
Diffstat (limited to 'include/gssapi')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud