From nobody Fri May 19 08:10:30 2023 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 4QMzzp5pPxz4BdRG; Fri, 19 May 2023 08:10:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QMzzp5B8Nz4CMP; Fri, 19 May 2023 08:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684483830; 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=n7yKMNhAZcJDLeZ+mRnHd1x9riOi7a93kcBKy0BkBFc=; b=WVC2Ltar0Knw9TP51JgfhQ++NSyRCgVusfgUDdDwrmm6Wjx4yhwfVkg9Eu6CdOpJj9dVZN wP+7f+hwqyHCuNzsUPkc97sA3jiRVD0Z8t3sP9pYFwYash3ZF9ke77TBxzwBcoVMulFhGo mZ4LwsTBt4DPkecIH6KCcXyMtI/4azcGaK95358i2NJjNHOgPs6nkj796CIsh71iwUR8yh JEXSGUFIhrORKwELndr95AtAeh1CjICVuly07yIXFkdJXMeu9B2vIBa8X4oNrjaXw7U2SL yRBPRwuedotAR4mlscZZbHuHNuohkfu+S6Q5VuAPjxmLb3F5YtcDLJS1Rw8XEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684483830; 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=n7yKMNhAZcJDLeZ+mRnHd1x9riOi7a93kcBKy0BkBFc=; b=mWYShBbPCIlOuPQapka/qyZotqgpnFit+lxDUN3JbqtwTbDX2K/or+DIqqA3vwj/IwVJ8w OjfIXPSFCLnthKWbyHNLSWc9bVnPsAD8WsGToGcMMyj1LZut8uGKdgbIXqZ92mcbdeve9M eoyROg/YNJ/V9gfZypiV/CTQhCTEKHL/my92o6dIGYjTCfAYloPf7FAjEk6gXQurPq1dji T+fSIv0yO8r/F1Bugo16Hj+7cL5oGuRiLjXcH5+/e6VWqDllUNZ/6y1yKCZCDE1t89UokT hrZjkkfjbA2pSKzMVlxQB74rMulhR6+9B0vzuw1Llh8GEcooMS2QtdwXNcvs6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684483830; a=rsa-sha256; cv=none; b=a1DXF6nausN741Ly4B3SRQJkzpy2fW0pH0EIMwfe+qUpLB1DJmG1TxJhDxoDYnRJOjaM8d Qk0Tj5uXrgmRCQ0r2VBz7cDqxnDimPECCKF5ex3U+oaB4bMJUuRUGtNgsVqQiG/0+PtbkS VBoclrbgP8kuTMKPOPQVuXlKv8MhfRn5W79Z9MI12NKjRPZFFaQN4zeAvIrd8Xm5vmVt8A U4s+9FmX7Ddx1xnCBbzbkndCXT5rD7U5B6I1mPArQHlRwRjYRxJWA6wujhLGNuo3A3vsX5 2biDYJn1UpJIyl72Jo78JwZWLirOkL2nzezagSStBwCCsdurVUlj+Bav3Vku9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QMzzp4HgbzKhL; Fri, 19 May 2023 08:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34J8AUM0009873; Fri, 19 May 2023 08:10:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34J8AUeF009872; Fri, 19 May 2023 08:10:30 GMT (envelope-from git) Date: Fri, 19 May 2023 08:10:30 GMT Message-Id: <202305190810.34J8AUeF009872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c1150a63791d - stable/13 - pw: do not call system() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/13 X-Git-Reftype: branch X-Git-Commit: c1150a63791d98598395dfaf8cd880cd3173194b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c1150a63791d98598395dfaf8cd880cd3173194b commit c1150a63791d98598395dfaf8cd880cd3173194b Author: Baptiste Daroussin AuthorDate: 2023-05-15 06:55:08 +0000 Commit: Baptiste Daroussin CommitDate: 2023-05-19 08:08:15 +0000 pw: do not call system() Calling system makes pw(8) spawn a shell, which can then be abused. MFC After: 3 days (cherry picked from commit ef7d0eb9489f39169a1ae83c576fe74e40d126ad) --- usr.sbin/pw/pw_user.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c index b16faaf52bdb..f0f87b923c0d 100644 --- a/usr.sbin/pw/pw_user.c +++ b/usr.sbin/pw/pw_user.c @@ -50,6 +50,7 @@ static const char rcsid[] = #include #include #include +#include #include "pw.h" #include "bitmap.h" @@ -57,6 +58,7 @@ static const char rcsid[] = #define LOGNAMESIZE (MAXLOGNAME-1) +extern char **environ; static char locked_str[] = "*LOCKED*"; static struct passwd fakeuser = { @@ -695,11 +697,16 @@ rmat(uid_t uid) stat(e->d_name, &st) == 0 && !S_ISDIR(st.st_mode) && st.st_uid == uid) { - char tmp[MAXPATHLEN]; - - snprintf(tmp, sizeof(tmp), "/usr/bin/atrm %s", - e->d_name); - system(tmp); + const char *argv[] = { + "/usr/sbin/atrm", + e->d_name, + NULL + }; + if (posix_spawn(NULL, argv[0], NULL, NULL, + (char *const *) argv, environ)) { + warn("Failed to execute '%s %s'", + argv[0], argv[1]); + } } } closedir(d); @@ -950,9 +957,18 @@ pw_user_del(int argc, char **argv, char *arg1) /* Remove crontabs */ snprintf(file, sizeof(file), "/var/cron/tabs/%s", pwd->pw_name); if (access(file, F_OK) == 0) { - snprintf(file, sizeof(file), "crontab -u %s -r", - pwd->pw_name); - system(file); + const char *argv[] = { + "crontab", + "-u", + pwd->pw_name, + "-r", + NULL + }; + if (posix_spawnp(NULL, argv[0], NULL, NULL, + (char *const *) argv, environ)) { + warn("Failed to execute '%s %s'", + argv[0], argv[1]); + } } }