From nobody Fri May 19 08:20:06 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 4QN0Bt4df0z4BfF1; Fri, 19 May 2023 08:20:06 +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 4QN0Bt4BZkz4Gq9; Fri, 19 May 2023 08:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684484406; 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=48mgwFaER4RJf7PnXu2PylfrnuPeU4U4vvRZQ0VRhSY=; b=gXqj4tRbd21YBOE315QHl7Mzk/nTDgD0qqvbdvjes1xuC0kuVPjndIT9M9fSXWr1BQaraD IozKxHQMpPvP13m9LtFOqV/tvjLJuPwRiuE+ubqpfEQ52eE74nprPR2+YYkYhVQ9x+Mopd jKqSH8HJG+zmfctocZGxS+pJLEWqWum2fJrRuF77Q3h/U0VzM8HAaJt/gpDck47TEqWkBy afJ+Uru0VaXIWZK6VTZTyqqbP76xeOI7owb0YjBN8NMWgWsHJY9rbxUHGGfKS43WQGucSx 7cC43DVm+9qt7AkwClx4W04HemnuEBlvhNJIa2jLxGZyUa5svrBT094rfB1WJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684484406; 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=48mgwFaER4RJf7PnXu2PylfrnuPeU4U4vvRZQ0VRhSY=; b=mFeuBKOJAEC+3X0TKkdxiG1uGZej7gG82gTj6vsouTR++I5bYDoRush3C7IKwZt7OTkHDx QfTtT6Zy5c7tO96CK1oKKcfPdMLUwdvLTLV91uwvCgcYlJVNIXxX7EFuQrVdMpXDsrtsQY HjfCMffZmUicPavVYyDSF2+SFMK7p2ESAH8TNTl3bF9/J7u3MCrGpaPRaw67is1SgqWJ20 Pr4tOKJkJImwsVQVFNm6oeDkyCED9MyFPOu7B4CIQXnIuSguC3Jc8J6Nyufqs814QN4pqb KnL4uAZA2P++VFDvkrIQZUPLXgJQCOGM6PIPSx840SxvfedovuRmDHS1gPYSQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684484406; a=rsa-sha256; cv=none; b=w91rSUeDb/CvXc8NBYhTDDYDTZqSe9p6gIjVZ4bEoyXerIFrePQCKMBFd7V9LhMRXbMy1I 8PiGH8dv3HjzgQhkQ2J9otBRljY7zgI6QKBDMlQ1VeN/pgn1mpU3xTsTLJkQyuzyiPurkM R9QjnTBEkRAkleBDEfBaDhBC1MuwgKRbpogecAWCEe6kBv9jw6XOvoDH+Q22u6rgXyBeLd O5dml2+MO5CXhFgCbgIkGRQYtYL2lus04tU45WRe7JUik1cyr83H3HKOfNb3m9IRb7osOM +BNq411/C5xjvj73DnKG9BhdnmTMoKv0yMHhFBJECPv3TA3NMg9Vjt5E/s2+Og== 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 4QN0Bt2yMVzLJF; Fri, 19 May 2023 08:20:06 +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 34J8K6w8021526; Fri, 19 May 2023 08:20:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34J8K6AU021524; Fri, 19 May 2023 08:20:06 GMT (envelope-from git) Date: Fri, 19 May 2023 08:20:06 GMT Message-Id: <202305190820.34J8K6AU021524@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: 2f251aa5ad7f - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 2f251aa5ad7fd53b42e594ff7d46eafd58acbb6e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2f251aa5ad7fd53b42e594ff7d46eafd58acbb6e commit 2f251aa5ad7fd53b42e594ff7d46eafd58acbb6e Author: Baptiste Daroussin AuthorDate: 2023-05-15 06:55:08 +0000 Commit: Baptiste Daroussin CommitDate: 2023-05-19 08:19:55 +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 21a4c5a0c26e..778855e3d1cd 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); @@ -944,9 +951,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]); + } } }