c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-10-26 18:05:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix buffer overflow in dsl_dataset_name()

Browse Source 
If we're creating a pool with version >= SPA_VERSION_DSL_SCRUB (v11)
we need to account for additional space needed by the origin dataset
which will also be snapshotted: "poolname"+"/"+"$ORIGIN"+"@"+"$ORIGIN".

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #6374
This commit is contained in:
LOLi 2017-07-24 21:56:49 +02:00 committed by Brian Behlendorf
parent 83a5e4d6b9
commit 871e07321c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
module/zcommon/zfs_namecheck.c
View File

@ -44,6 +44,7 @@
#include <string.h> #include <string.h>
#endif #endif
#include <sys/dsl_dir.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/nvpair.h> #include <sys/nvpair.h>
#include "zfs_namecheck.h" #include "zfs_namecheck.h"
@ -300,8 +301,14 @@ pool_namecheck(const char *pool, namecheck_err_t *why, char *what)
/* /*
* Make sure the name is not too long. * Make sure the name is not too long.
* If we're creating a pool with version >= SPA_VERSION_DSL_SCRUB (v11)
* we need to account for additional space needed by the origin ds which
* will also be snapshotted: "poolname"+"/"+"$ORIGIN"+"@"+"$ORIGIN".
* Play it safe and enforce this limit even if the pool version is < 11
* so it can be upgraded without issues.
*/ */
if (strlen(pool) >= ZFS_MAX_DATASET_NAME_LEN) { if (strlen(pool) >= (ZFS_MAX_DATASET_NAME_LEN - 2 -
strlen(ORIGIN_DIR_NAME) * 2)) {
if (why) if (why)
*why = NAME_ERR_TOOLONG; *why = NAME_ERR_TOOLONG;
return (-1); return (-1);