Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix crash in zio_done error reporting 

Fix NULL pointer dereference when reporting
checksum error for gang block in zio_done.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Paul Zuchowski <pzuchowski@datto.com>
Closes #11872
Closes #11896
This commit is contained in:
Paul Zuchowski 2021-04-16 14:00:53 -04:00 committed by Brian Behlendorf
parent dc4d55268c
commit d938c6ee27
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
module/zfs/zio.c
View File

@ -25,6 +25,7 @@
* Copyright (c) 2017, Intel Corporation. * Copyright (c) 2017, Intel Corporation.
* Copyright (c) 2019, Klara Inc. * Copyright (c) 2019, Klara Inc.
* Copyright (c) 2019, Allan Jude * Copyright (c) 2019, Allan Jude
* Copyright (c) 2021, Datto, Inc.
*/ */
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
@ -4539,7 +4540,7 @@ zio_done(zio_t *zio)
uint64_t asize = P2ROUNDUP(psize, align); uint64_t asize = P2ROUNDUP(psize, align);
abd_t *adata = zio->io_abd; abd_t *adata = zio->io_abd;
if (asize != psize) { if (adata != NULL && asize != psize) {
adata = abd_alloc(asize, B_TRUE); adata = abd_alloc(asize, B_TRUE);
abd_copy(adata, zio->io_abd, psize); abd_copy(adata, zio->io_abd, psize);
abd_zero_off(adata, psize, asize - psize); abd_zero_off(adata, psize, asize - psize);
@ -4550,7 +4551,7 @@ zio_done(zio_t *zio)
zcr->zcr_finish(zcr, adata); zcr->zcr_finish(zcr, adata);
zfs_ereport_free_checksum(zcr); zfs_ereport_free_checksum(zcr);
if (asize != psize) if (adata != NULL && asize != psize)
abd_free(adata); abd_free(adata);
} }
} }