From nobody Fri Jun 5 06:02:38 2026 X-Original-To: dev-commits-src-main@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 4gWrSZ72Y9z6gSwn for ; Fri, 05 Jun 2026 06:02:38 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gWrSZ5jYhz3HGr for ; Fri, 05 Jun 2026 06:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780639358; 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=AFFKDUFkZU++q9pzuAq/wapr4sX25971sq1U9Vlvb4M=; b=El5ZfA6mN01y4RIgaMYDCGvVr8WByVhbDMqgamgFchCIoJXD1hjzql+H0YFbLIcsFz7MV2 G3EkZcrK940idM66DRs030cYRTV8yEoV09rM3drqHJsmwnlXS2XnNLvmIBTZL4AmoVfZP4 /X1U3V45lRHFtC/ersVhZLlIqK/PrqBrOxlzNy4/R+OPpBonlUzMXz1sYh1hQVkvzde1aX E02c/HCXNuMtPS8Nu+k762JwPQ4mJK/VP+ToVYUs0feYiVsUzfF2xyakZCWlt/828ldCa3 Z2CiOXKUxmZR+2QBfTcdwXY96+3k31NJlq1abb+QYyl+C6Cen0B1dfCaUxdMXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780639358; a=rsa-sha256; cv=none; b=dEEshwSR8vaLu4qoKzkXUxVyi0HAB7no36DOY9I1AB1Aj0T8e8orrzsGHhywUHh1VCwxH/ W3GJv6dTw6hEfW5RluBDWfDcrDhol/rccfDEAGHP6u8i+Bh5gtS2AWlSQL+z1JofOql+y8 CV6A9/Msxu9kLeFWu7wLDSqCwH1zh8yv8J2MQ9Y38Y95A5RxtRrnGQBKcf8TyRj0tZf+Qt 9L6iYubJYdDFGQU561lSBii9zAS+MvIyayBjpeuTuYCdwW6PyYg/NKuj/ELICqEau9U3Km PnDlMwoK2YTjj72ZThirlNGCG2gfivF1r/WBe9IPNKU9pRPf6q0freZRxjWdMQ== 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=1780639358; 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=AFFKDUFkZU++q9pzuAq/wapr4sX25971sq1U9Vlvb4M=; b=qYece8GGS4+yPZuQUo8qSe2kmm7YesgSG35iqXrN4FNFWVn7yrJn7aPIA+6Nb31uAy1e3x NoJzaYXvbhJ2ez+cueSsaCFAAAF4xnV+C1cUn/Y7irAuP0Wa7L6s6DA0PeVcYPQ//XhiIg ySthZcZe/8Wy5BP9FM+Y4MD+5zhk793TgUXEUPAVCUj0Du6U0Jo6GfzIFBVLjk+3PF9f0x VyPqVrXo3ECRX+Yes7NoggM+G3hE8djdM69nkYV9qXUw370uc34DSib+Sil1dOaKUln9EJ BoXk8XiJIL1zzs1lz+LqfGxVStLVxpMtHik4PgEqsxuOMVysFqm9MxlCT3V3rA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWrSZ50zwz1fJ for ; Fri, 05 Jun 2026 06:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25fe8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Jun 2026 06:02:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: fe1e912d5a39 - main - pw: fix setmode(NULL) crash when homemode is a boolean value List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fe1e912d5a394565e9adfbc443555ae0b3f087e5 Auto-Submitted: auto-generated Date: Fri, 05 Jun 2026 06:02:38 +0000 Message-Id: <6a22667e.25fe8.58118391@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=fe1e912d5a394565e9adfbc443555ae0b3f087e5 commit fe1e912d5a394565e9adfbc443555ae0b3f087e5 Author: Baptiste Daroussin AuthorDate: 2026-06-04 22:13:52 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-05 06:01:50 +0000 pw: fix setmode(NULL) crash when homemode is a boolean value --- 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 }