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

Panic when running 'zpool split' 

Added missing remove of detachable VDEV from txg's DTL list
to avoid use-after-free for the split VDEV

Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Jorgen Lundman <lundman@lundman.net>
Signed-off-by: Roman Strashkin <roman.strashkin@nexenta.com>
Closes #5565 
Closes #7856
This commit is contained in:
Roman Strashkin 2019-03-22 23:11:36 +03:00 committed by Brian Behlendorf
parent 2efea7c82c
commit 234234ca4d
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
module/zfs/spa.c
View File

@ -6842,6 +6842,18 @@ spa_vdev_split_mirror(spa_t *spa, char *newname, nvlist_t *config,
dmu_tx_abort(tx); dmu_tx_abort(tx);
for (c = 0; c < children; c++) { for (c = 0; c < children; c++) {
if (vml[c] != NULL) { if (vml[c] != NULL) {
vdev_t *tvd = vml[c]->vdev_top;
/*
* Need to be sure the detachable VDEV is not
* on any *other* txg's DTL list to prevent it
* from being accessed after it's freed.
*/
for (int t = 0; t < TXG_SIZE; t++) {
(void) txg_list_remove_this(
&tvd->vdev_dtl_list, vml[c], t);
}
vdev_split(vml[c]); vdev_split(vml[c]);
if (error == 0) if (error == 0)
spa_history_log_internal(spa, "detach", tx, spa_history_log_internal(spa, "detach", tx,