From nobody Mon Jan 22 14:29:09 2024 X-Original-To: dev-commits-src-all@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 4TJXfF5973z5817n; Mon, 22 Jan 2024 14:29:09 +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 4TJXfF4htbz49sH; Mon, 22 Jan 2024 14:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705933749; 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=cg0FMp8wfAdzUp2qwtpaNwjykT+QRPcmjIwp9jhqQT8=; b=dyOwPDBVdo7upB7/RuEUcavauTxmFGtcmvnUxjJ8lvQ3N6D4ReD19NYqfxrsbZFdzLFpWh as2n/a1fQmaH5s/3BsmfH/FpMR5EJyXcojjlqGJudVDrJQXXEqt8mQfzdRhrL1hJFfZdRW Npu5sqtYgNT7x2NTTXwAWBnOV/8h8ZdC1kWloP4YPWp98+GaxpCKR4p2Irg/+O9OJTqMk4 4OGDidMiPkpRFerOMHgQFI4A2MvLDglw4zGPfdD4TM9hbdKe1z40tAqeR1s9AP1Yl00+Nd XN+53F8DHF/c+Q0b7iyQsOXZIV5rtLFu2ON22em/K8Ihxut7FS3Rsi1oF1bsgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705933749; 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=cg0FMp8wfAdzUp2qwtpaNwjykT+QRPcmjIwp9jhqQT8=; b=j9tZEqAWHXI1UFIw+4BZuOIPlYEn7WrtJWmPhIQ+7dFpqu0p7xpas+TgkCvroOKAMRI0fb HftFVy5OsOei1TZDZkDcWVO/NsxOehBj6X/i7nSRVPAdz3EDl9yJWrQWiOMCFkOEc8hCOR xbDZWrvAn0OYUk+JvXObbMqJP9dtwK/YqQLkaValz13S9bMUkvJp78I2tf4qEH3oOJuIx8 J7241lSIFkmO4pW8PjlKIW5ou9NGQ4aK+mjs1lrtrD5y7YfhhBtQj/d6uU6TYoB/12+BvT fVBbH1YgLW+3toxu687tVzy9mrCToZIwoNUMc1Fj20s+MZUAgYwfUUKIjVXt+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705933749; a=rsa-sha256; cv=none; b=auvlWbh9Cvi7wyAOuewcPTsPY1R5ipGYH9n7lnFLOoAWxRQM8KX4L0r27lmQM9YjqH17PZ 3giU7S6gvg+i1BRxE8SGvXdCY/6r4fo5uKGmyULqTMzEPLWAjK+WsUUkAfJWO4fXDC1RAt cT7YUvD6wWhxRnX90WE/WNhSGK1iYYSke3uh0TwK9clUZjRSqL/cCRcWF/U7XGC5G5P/00 uMkzd9lybnkN6Lx7bK3Aa+2hrt7qftCvbCVwD3bqtxSSdV1CMLNqI9pg2oFJk1PZwxr5Gc Co7GYbupEosfCRlTkZL+CbcMKG14v1ylGSKTnwO1QYsuTyvLAhfKi202RDHp3g== 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 4TJXfF3lxfz15Dy; Mon, 22 Jan 2024 14:29:09 +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 40MET9qi001233; Mon, 22 Jan 2024 14:29:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MET9eJ001230; Mon, 22 Jan 2024 14:29:09 GMT (envelope-from git) Date: Mon, 22 Jan 2024 14:29:09 GMT Message-Id: <202401221429.40MET9eJ001230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d8d0ecd9739d - stable/13 - makefs: Handle missing link keyword in mtree spec List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d8d0ecd9739d5201c6d56d1a898b95f7ce35bdf5 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d8d0ecd9739d5201c6d56d1a898b95f7ce35bdf5 commit d8d0ecd9739d5201c6d56d1a898b95f7ce35bdf5 Author: Stéphane Rochoy AuthorDate: 2023-09-21 07:14:20 +0000 Commit: Ed Maste CommitDate: 2024-01-22 14:28:57 +0000 makefs: Handle missing link keyword in mtree spec PR: 241178 Reviewed by: emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/850 (cherry picked from commit d26c1a0f8bceb6748436fe3fc57bac3ef8179dd3) (cherry picked from commit be31bd59895e57fb7359de870ea3ecc19e3d1ae1) --- usr.sbin/makefs/mtree.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c index 688ce81e733d..1fe2eb4097b2 100644 --- a/usr.sbin/makefs/mtree.c +++ b/usr.sbin/makefs/mtree.c @@ -740,7 +740,10 @@ read_mtree_keywords(FILE *fp, fsnode *node) type = S_IFREG; } else if (node->type != 0) { type = node->type; - if (type == S_IFREG) { + if (type == S_IFLNK && node->symlink == NULL) { + mtree_error("%s: link type requires link keyword", node->name); + return (0); + } else if (type == S_IFREG) { /* the named path is the default contents */ node->contents = mtree_file_path(node); }