From edb20ff3bab31f9e07578a7bf8279d67b821f29a Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 9 Dec 2020 14:52:45 -0800 Subject: [PATCH] Fix optional "force" arg handing in zfs_ioc_pool_sync() The fnvlist_lookup_boolean_value() function should not be used to check the force argument since it's optional. It may not be provided or may have been created with the wrong flags. Reviewed-by: Ryan Moeller Signed-off-by: Brian Behlendorf Closes #11281 Closes #11284 --- module/zfs/zfs_ioctl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 33bd39aa2d..74f05e268c 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -6648,14 +6648,17 @@ static int zfs_ioc_pool_sync(const char *pool, nvlist_t *innvl, nvlist_t *onvl) { int err; - boolean_t force = B_FALSE; + boolean_t rc, force = B_FALSE; spa_t *spa; if ((err = spa_open(pool, &spa, FTAG)) != 0) return (err); - if (innvl) - force = fnvlist_lookup_boolean_value(innvl, "force"); + if (innvl) { + err = nvlist_lookup_boolean_value(innvl, "force", &rc); + if (err == 0) + force = rc; + } if (force) { spa_config_enter(spa, SCL_CONFIG, FTAG, RW_WRITER); @@ -6666,7 +6669,7 @@ zfs_ioc_pool_sync(const char *pool, nvlist_t *innvl, nvlist_t *onvl) spa_close(spa, FTAG); - return (err); + return (0); } /*