From nobody Fri Jan 05 00:23:09 2024 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 4T5kgy6Knfz55fRB; Fri, 5 Jan 2024 00:23:10 +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 4T5kgy1K54z4dfd; Fri, 5 Jan 2024 00:23:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704414190; 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=wJ9cw3vKfDRCMQzUontnZSPT86prTW6WCxR7obrIr/c=; b=b5hs4Yn+HBbkEFysUdkU9OpJZdhLBikLtHBlcpQbDHhO0R5FiuEj9y05xsd7iPnZfhgUYD favIIiTCF+fIUbxLNXbHkDjmDMYCb2NFDDYLcEQVwdi+0+24yVZtfKScp59+1oC1Cq0cQi ZKkL6iHk+MTeLvPBN15+h5QfO8idV/g8BNeA/1HuIVY49HBykNaPDv8Nk6zRk9PS10DTcE kHpnBmctgb79OA+XnQRqk0vHSp1KTFHgGK0DPUU6INgzqwoL1jxnznU/l6TsfA5XOUmp4O ESESrvmHuqeoZATOWYlbneUZNnkUZbiwUicLUKU7E2F/2JjiD46GFU4s6XHJpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704414190; 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=wJ9cw3vKfDRCMQzUontnZSPT86prTW6WCxR7obrIr/c=; b=cRQMAq6nRjxDOU8+tz3xSdLGg+hmOb4jaBeVGfWMYxNhm3Jsj0ZNZIfAWm5WG9sfIrRC29 AZriHBrZyqZeubbOMAxOWr66hmPkzgJAkSrPddqJwB/SNEyJZ2cVW+8G/g+Eu3q3L0lSgw GgcpRY7aylTWjMMGpJ+NcKPw0E2gLhNxCNFddgCBoPd+ElEG5aNrg8uPhJgX4zuXqKkNu4 yCGITBRrYLomFgSqvAWosN3piw19e8URQo1kFj5HTPxYvG80jj0GRGPjQpSpV5+4Kn7o2Y BfROZJN7E7+wGOxp3ijIvLZfIYPwdRGOQaFfPAfavyMSY4yR9wjHt13qrClv4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704414190; a=rsa-sha256; cv=none; b=auKiMJZXGQ1yuFMt5GxRxeVJSKp4eRQ5CNZkJHVhWQMBMicT8AQ9HuFIfhiMOXPlMAdGmI 4kCWmE6JQ0hClOcfqKd2PACLBgbyLZq1Yg5Pj3ffu28l7tSFQHB28w1oYoj18RbmqNtl6a 4hYGR1z+Fs72djb8h1iyvV5kIeWwt0kFHz14f+BPP1GvEsDWts5DnLwWEiVg6CFjaJ7vl/ ZSigYWn39NDefBx1W425wqNpp2foC3RkKJpfVYAN0Paw/+CQzm6iAcVQJT3BIhsojEaMxs PkNRhjBG8RmNPp5P9sr7UCfMwsN3cbJ1iSmhm0YyIGky+ajFRjXrXSS2AVjKow== 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 4T5kgy0Qrczbf9; Fri, 5 Jan 2024 00:23:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4050N9Ms025475; Fri, 5 Jan 2024 00:23:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4050N9Vn025472; Fri, 5 Jan 2024 00:23:09 GMT (envelope-from git) Date: Fri, 5 Jan 2024 00:23:09 GMT Message-Id: <202401050023.4050N9Vn025472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a403492f96be - stable/13 - bsdinstall partedit: Use asprintf to build wrapper command for newfs 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a403492f96be71caa46e887bec58be5091d0c8f8 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a403492f96be71caa46e887bec58be5091d0c8f8 commit a403492f96be71caa46e887bec58be5091d0c8f8 Author: John Baldwin AuthorDate: 2023-10-16 23:25:25 +0000 Commit: John Baldwin CommitDate: 2024-01-05 00:11:11 +0000 bsdinstall partedit: Use asprintf to build wrapper command for newfs Don't abuse the message[] static buffer used elsewhere for error messages to generate the command that actually newfs's each filesystem. Use asprintf to a more aptly-named 'char *command' variable to construct the string instead. This avoids potential bugs from truncation of the command string. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42239 (cherry picked from commit a8676bf367b099dcc97ff61031cbf4ceb5e37899) --- usr.sbin/bsdinstall/partedit/partedit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index 0f116d2c716a..c8961d03c5cc 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -336,6 +336,7 @@ apply_changes(struct gmesh *mesh) const char **items; const char *fstab_path; FILE *fstab; + char *command; nitems = 1; /* Partition table changes */ TAILQ_FOREACH(md, &part_metadata, metadata) { @@ -374,10 +375,11 @@ apply_changes(struct gmesh *mesh) dialog_mixedgauge("Initializing", "Initializing file systems. Please wait.", 0, 0, i*100/nitems, nitems, __DECONST(char **, items)); - sprintf(message, "(echo %s; %s) >>%s 2>>%s", + asprintf(&command, "(echo %s; %s) >>%s 2>>%s", md->newfs, md->newfs, getenv("BSDINSTALL_LOG"), getenv("BSDINSTALL_LOG")); - error = system(message); + error = system(command); + free(command); items[i*2 + 1] = (error == 0) ? "3" : "1"; i++; }