From nobody Fri Nov 20 20:47:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jWS7S6f4Kz6w3cY for ; Fri, 20 Nov 2026 20:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jWS7S6C3Fz4K0Q for ; Fri, 20 Nov 2026 20:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795207620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZKjEYGTc0VIPQ/ic1FP4F5rs8BOeqjwrXJuNy6u5RE=; b=Pi2/ZiIM8MmN/QZUq45COgapIMemQbh7reM1TNBRsbiJZA52k6htw8TiqCQLf01eq9OPgZ jTXK38RQ4YjRc9PL/f10UtZIJ/RrQUNKibCj8silZDt7Xv4knmnzdVgqePEoz0TIHWjkTZ c+eMGtFobDvpLbspxtpNaRU1BFDl6+IKr0RS9lKR9A5ks+cy9ayjYdQKtSPa3Z0e+i4Srk 3piDfm4KUHdxBE4mAEk/mlVd0G/jKHOv/NMterZN4y8sqR+PvYe7Xn1fKYYhLCVVqdFC9y NOyqYf71nFbJ+hSS7TgSjhDFQuil1p0v3aOUurfjGDC5q8QizqZU6jKkacNBJg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795207620; b=HdvZhHRU1Zp1cy1mQaT8EEAdIUpXknKCiDd56Xs9VvMKA8FydcSIRG6o9wOPdaSNeuyuMj uV/6XbKwjQ67y8G7G/VVM8qLRbo/loneFCBFa8VY7m0ZHDMs6kvTgbuBJTT4ly7Hql2W0g ttO5TDsnJBIVoMkAdiykkbrd353tcwhaWu09VfYcLyFTrqX5Dk4fy4jHQ6BL5oJOT2WNhR +mzcsifhV3MsnRNJbBibrdoNU/qJ6CPx92gcgXplui+8hkDg21ffBSFn/KLnPZaCMxU22t LzUQo0E3HWnau9JbBTovD4SfUTdNda4riU1UT+3lVn8cgTq17m65f7MwdOqlow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795207620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZKjEYGTc0VIPQ/ic1FP4F5rs8BOeqjwrXJuNy6u5RE=; b=n40rDkQJMmjBjzu3lGy0Lbxx8qNhqNd9pTtZNjZZg3rEvhitahpvMOXc/sdrrv5qtuB2uR /6GHM3dBZE+txop08a+4nWBDsjh1C5i1RvpBCn79PsgSRFsSIdaBhxDwOp5IHDLdTwGSB5 4v7XM+KE47aNxRMiU2rYjgLcyXYcfISGuYKpfpaUZQ4vKjB1gixMjdry7P5BrZ7RWxjoI+ qTChIXhYVcvXWK2K4F6G+XAEGkb2SPCqBey6ih/Xh5/LqKyLyTCQc0gauZhO+5xXBXOayw K3BZB2Z4kROSOHFE/XNsra2C0LWrrcqqhtjR1CCeTPjY1P8eC+NgD21GutmScQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jWS7S5bnBz14M1 for ; Fri, 20 Nov 2026 20:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 12b34 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Nov 2026 20:47:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 73911716076d - main - zfsbootcfg: don't crash on bad or incomplete options List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73911716076dd535129da05181ac4d86573f5d62 Auto-Submitted: auto-generated Date: Fri, 20 Nov 2026 20:47:00 +0000 Message-Id: <6b00b1c4.12b34.1d6a7e48@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=73911716076dd535129da05181ac4d86573f5d62 commit 73911716076dd535129da05181ac4d86573f5d62 Author: Kyle Evans AuthorDate: 2026-11-20 20:46:40 +0000 Commit: Kyle Evans CommitDate: 2026-11-20 20:46:40 +0000 zfsbootcfg: don't crash on bad or incomplete options getopt() errors fell through the switch without a default case, so zfsbootcfg carried on with whatever options it had. Setting a key without a value, whether with -k alone or after such an error, then crashed in add_pair() on a NULL value. Print a usage message and fail for unknown options, missing option arguments, and a key with no value to set it to. While we're here, clean up some pre-existing style issues and ensure we properly route warnings/errors to stderr. Reviewed by: avg, des Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D61833 --- sbin/zfsbootcfg/zfsbootcfg.c | 45 +++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/sbin/zfsbootcfg/zfsbootcfg.c b/sbin/zfsbootcfg/zfsbootcfg.c index 03b028a9ab71..7102b6355ec0 100644 --- a/sbin/zfsbootcfg/zfsbootcfg.c +++ b/sbin/zfsbootcfg/zfsbootcfg.c @@ -1,6 +1,10 @@ /*- * Copyright (c) 2016 Andriy Gapon * All rights reserved. + * Copyright (c) 2026 The FreeBSD Foundation + * + * Portions of this software were developed by Klara, Inc. under sponsorship + * from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -24,14 +28,15 @@ */ #include +#include #include -#include #include +#include +#include +#include #include #include -#include #include -#include #include #include @@ -175,6 +180,18 @@ delete_pair(const char *name, const char *nvlist, const char *key) return (rv); } +static void +usage(void) +{ + fprintf(stderr, "%s\n%s\n%s\n%s\n", + "usage: zfsbootcfg [-z pool] [options]", + " zfsbootcfg [-z pool] [-n name] -k key [-t type] -v value " + "[-p]", + " zfsbootcfg [-z pool] [-n name] -d key [-p]", + " zfsbootcfg [-z pool] [-n name] -p"); + exit(1); +} + /* * Usage: zfsbootcfg [-z pool] [-d key] [-k key -t type -v value] [-p] * zfsbootcfg [-z pool] -n nvlist [-d key] [-k key -t type -v value] [-p] @@ -220,6 +237,8 @@ main(int argc, char * const *argv) case 'z': name = optarg; break; + default: + usage(); } } @@ -229,16 +248,17 @@ main(int argc, char * const *argv) if (argc == 1) value = argv[0]; - if (argc > 1) { - fprintf(stderr, "usage: zfsbootcfg \n"); - return (1); - } + if (argc > 1) + usage(); + + /* Setting a key needs something to set it to. */ + if (key != NULL && !delete && value == NULL) + usage(); if (name == NULL) { rv = kenv(KENV_GET, "vfs.root.mountfrom", buf, sizeof(buf)); if (rv <= 0) { - perror("can't get vfs.root.mountfrom"); - return (1); + err(1, "can't get vfs.root.mountfrom"); } if (strncmp(buf, "zfs:", 4) == 0) { @@ -247,8 +267,7 @@ main(int argc, char * const *argv) *name = '\0'; name = buf + 4; } else { - perror("not a zfs root"); - return (1); + err(1, "not a zfs root"); } } @@ -267,7 +286,7 @@ main(int argc, char * const *argv) if (rv == 0) printf("zfs bootenv is successfully written\n"); else - printf("error: %d\n", rv); + warnx("error: %d\n", rv); } else if (!print) { char *ptr; @@ -281,5 +300,5 @@ main(int argc, char * const *argv) rv = lzbe_bootenv_print(name, nvlist, stdout); } - return (rv); + exit(rv != 0); }