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

OpenZFS 6876 - Stack corruption after importing a pool with a too-long name 

Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>

Calling dsl_dataset_name on a dataset with a 256 byte buffer is asking
for trouble. We should check every dataset on import, using a 1024 byte
buffer and checking each time to see if the dataset's new name is longer
than 256 bytes.

OpenZFS-issue: https://www.illumos.org/issues/6876
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/ca8674e
This commit is contained in:
Paul Dagnelie 2016-06-15 14:51:27 -07:00 committed by Brian Behlendorf
parent eca7b76001
commit d1d19c7854
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libzfs/libzfs_pool.c
View File

@ -1907,7 +1907,12 @@ zpool_import_props(libzfs_handle_t *hdl, nvlist_t *config, const char *newname,
"one or more devices are already in use\n")); "one or more devices are already in use\n"));
(void) zfs_error(hdl, EZFS_BADDEV, desc); (void) zfs_error(hdl, EZFS_BADDEV, desc);
break; break;
case ENAMETOOLONG:
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"new name of at least one dataset is longer than "
"the maximum allowable length"));
(void) zfs_error(hdl, EZFS_NAMETOOLONG, desc);
break;
default: default:
(void) zpool_standard_error(hdl, error, desc); (void) zpool_standard_error(hdl, error, desc);
zpool_explain_recover(hdl, zpool_explain_recover(hdl,

18
module/zfs/spa.c
View File

@ -2016,6 +2016,16 @@ spa_load_verify_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
return (0); return (0);
} }
/* ARGSUSED */
int
verify_dataset_name_len(dsl_pool_t *dp, dsl_dataset_t *ds, void *arg)
{
if (dsl_dataset_namelen(ds) >= ZFS_MAX_DATASET_NAME_LEN)
return (SET_ERROR(ENAMETOOLONG));
return (0);
}
static int static int
spa_load_verify(spa_t *spa) spa_load_verify(spa_t *spa)
{ {
@ -2030,6 +2040,14 @@ spa_load_verify(spa_t *spa)
if (policy.zrp_request & ZPOOL_NEVER_REWIND) if (policy.zrp_request & ZPOOL_NEVER_REWIND)
return (0); return (0);
dsl_pool_config_enter(spa->spa_dsl_pool, FTAG);
error = dmu_objset_find_dp(spa->spa_dsl_pool,
spa->spa_dsl_pool->dp_root_dir_obj, verify_dataset_name_len, NULL,
DS_FIND_CHILDREN);
dsl_pool_config_exit(spa->spa_dsl_pool, FTAG);
if (error != 0)
return (error);
rio = zio_root(spa, NULL, &sle, rio = zio_root(spa, NULL, &sle,
ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE); ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE);

13
tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_rename_001_pos.ksh
View File

@ -26,7 +26,7 @@
# #
# #
# Copyright (c) 2012 by Delphix. All rights reserved. # Copyright (c) 2012, 2015 by Delphix. All rights reserved.
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib
@ -92,6 +92,8 @@ function cleanup
[[ -d $ALTER_ROOT ]] && \ [[ -d $ALTER_ROOT ]] && \
log_must $RM -rf $ALTER_ROOT log_must $RM -rf $ALTER_ROOT
[[ -e $VDEV_FILE ]] && \
log_must $RM $VDEV_FILE
} }
log_onexit cleanup log_onexit cleanup
@ -159,4 +161,13 @@ while (( i < ${#pools[*]} )); do
((i = i + 1)) ((i = i + 1))
done done
VDEV_FILE=$(mktemp /tmp/tmp.XXXXXX)
log_must $MKFILE -n 128M $VDEV_FILE
log_must $ZPOOL create testpool $VDEV_FILE
log_must $ZFS create testpool/testfs
ID=$($ZPOOL get -Ho value guid testpool)
log_must $ZPOOL export testpool
log_mustnot $ZPOOL import $(echo $ID) $($PRINTF "%*s\n" 250 "" | $TR ' ' 'c')
log_pass "Successfully imported and renamed a ZPOOL" log_pass "Successfully imported and renamed a ZPOOL"