From nobody Sun Jun 28 18:40:36 2026 X-Original-To: dev-commits-src-branches@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 4gpJBY5Dhzz6jkcL for ; Sun, 28 Jun 2026 18:40:37 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBY0lbJz3YGl for ; Sun, 28 Jun 2026 18:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672037; 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=tU2oUngAvkAAYEUDQ4eoeNj4jxthUYvAuoecz67yIlQ=; b=Us0FEJ3HgFWoovXnwxKL8ewV4CiYwr+A0lhyK5ZH/rQDOFc3NZTvNWUuKS1FZ8OytfAfmk XQ83CjUP4r7haA3o1D5Gww9WrG08FB8h4WDpCZw+ZHMUNZscpDROm6I0W+2t/hjjZ4h5ZD 0WbMlX4d0H17yUkNbxSD66cIFlQTZZmVJU76UcJMsM4UXCW5bBKsVQyBmj1yJjYTVuNum0 U6Wg7g3/r8ckflnh+1YOBkasCviPiWSV060QMH2ncjflEeZGoz8TMZYDJf37RNgWaTemqH DlAnulfYrAZM421qUv7jSDw6ZLiMdtX3eJ9xOvIOkjb5kmpin5GzCF2NWT4RzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672037; a=rsa-sha256; cv=none; b=mjmITwD/d/Zl5oNw1gK6sCVzV7W82AgzQ/mryvzUfVmtAIPzPqkfLWEZQAiDdwnPJ5rwUJ P5rZmkaCEFTvnzcxgzO3TF14nT36c2E7i5Lh4GnMBjShy8CwyBoujo8xhXQ01w2rDh7jLj Ylr3gbXhnFhPZWAcQ5AzH7xsXoirQ8XV7+5t8wHKwKrOhdb/cqUgyuutfFXg1NBV7ctZ4M M0CSEwvgfHSHkpMZZ8wLEaX8x6gRInghBNqFmOC5ouwAqtCoRSyMXvOpcYgKrTPk+Pqgx0 jd+nb3RF8MLjWJoKnk5IBeEZf/eMP+NTZXc1865DXwvxYHaUEQRT0u7r4brKCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672037; 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=tU2oUngAvkAAYEUDQ4eoeNj4jxthUYvAuoecz67yIlQ=; b=nggww1WTF0JpyT0nmcg2gLTBW1Ifamv9iKr4bC6HLOmddkedE2XxQOg3DEaxzVjsJ6AyBc TXPH8Hi1s8kHCRkYQvX8FZ3jFLt4f+DeHUR+pAQs/RGrochE9mNwhAOUCkgIdFhV8J6N3U arPKSQf2lWGBM9XxOqpO7QgNvR0QyhmSvt3JN6pzCrhR3I49Lsx+vMAVMqILhJQ3k2m7HE hDOM2PSL6UOXfC7kjNUw/sM5M52bnIbAC84BguIXO80YXfIv24+7JAg3tnCL0q/H08EsbP Y0CI6OsKgIMnnIWO4wsIm5ZUZiBsOu6chB7yKefea5HJZzocY0HN1KXkL+4A8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBX6sxWz70F for ; Sun, 28 Jun 2026 18:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d2ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c552051fb08f - stable/15 - pw: fix setmode(NULL) crash when homemode is a boolean value List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c552051fb08fdb3c599f9c1d5ab0af52169a73c8 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:36 +0000 Message-Id: <6a416aa4.1d2ee.51716b5b@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c552051fb08fdb3c599f9c1d5ab0af52169a73c8 commit c552051fb08fdb3c599f9c1d5ab0af52169a73c8 Author: Baptiste Daroussin AuthorDate: 2026-06-04 22:13:52 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:27 +0000 pw: fix setmode(NULL) crash when homemode is a boolean value (cherry picked from commit fe1e912d5a394565e9adfbc443555ae0b3f087e5) --- usr.sbin/pw/pw_conf.c | 14 ++++++++++---- usr.sbin/pw/tests/pw_config_test.sh | 12 ++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pw/pw_conf.c b/usr.sbin/pw/pw_conf.c index 21c4824ead93..7e8fdd375395 100644 --- a/usr.sbin/pw/pw_conf.c +++ b/usr.sbin/pw/pw_conf.c @@ -298,10 +298,16 @@ read_userconfig(char const * file) ? "/home" : newstr(q); break; case _UC_HOMEMODE: - modeset = setmode(q); - config.homemode = (q == NULL || !boolean_val(q, 1)) - ? _DEF_DIRMODE : getmode(modeset, _DEF_DIRMODE); - free(modeset); + if (q == NULL || !boolean_val(q, 1)) { + config.homemode = _DEF_DIRMODE; + } else { + modeset = setmode(q); + if (modeset == NULL) + errx(1, "Invalid mode: '%s'", q); + config.homemode = getmode(modeset, + _DEF_DIRMODE); + free(modeset); + } break; case _UC_SHELLPATH: config.shelldir = (q == NULL || !boolean_val(q, 1)) diff --git a/usr.sbin/pw/tests/pw_config_test.sh b/usr.sbin/pw/tests/pw_config_test.sh index e9209190dc5e..4087653fd4bb 100755 --- a/usr.sbin/pw/tests/pw_config_test.sh +++ b/usr.sbin/pw/tests/pw_config_test.sh @@ -19,7 +19,19 @@ modify_config_uid_gid_boundaries_body() { cat ${HOME}/foo.conf } +atf_test_case homemode_boolean_no_crash +homemode_boolean_no_crash_head() { + atf_set "descr" "Verify that homemode = yes in config gives a clean error" +} +homemode_boolean_no_crash_body() { + echo 'homemode = yes' > ${HOME}/bad.conf + populate_etc_skel + atf_check -s exit:1 -e inline:"pw: Invalid mode: 'yes'\n" \ + ${PW} useradd -D -C ${HOME}/bad.conf +} + atf_init_test_cases() { atf_add_test_case generate_config atf_add_test_case modify_config_uid_gid_boundaries + atf_add_test_case homemode_boolean_no_crash }