From nobody Wed Jan 29 12:36:00 2025 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 4YjhTY45zQz5mh50; Wed, 29 Jan 2025 12:36:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjhTY28Q6z4Jf0; Wed, 29 Jan 2025 12:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738154161; 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=uWYT+yf0VKuBRVkoX3AMEfm+wjjSNRTKxVsYnZ+CBiI=; b=FAQt2dyvfSS7hOI+q4BuJc6HDBMQsRRosZf7TVaR43g/DqJ2H/GPDpxOC+HR3CE68PKSfT N6z/Mymc4yBNR8K9Uq0dmbK+LlwJ637KsjZWm6NHks0JrnhuOSj4CmLdedmMUEcNAnUArS 4h9ztfgtqy/Y+EzqBlPa4JA+dn0x9+Ns5KqjU5231csGLokExAMeTRDxtqPLNh/Qpfmd3e Dq4heoTX112iESzn5qGiK0qXudLKr1hcIZfUcf6A6uA2NM0c/gfWgMd62ocBq+PNpmp3HZ zzy90m2mniRKVsMeuBERlXu+RrKMHaG3KTpiGfV/P+vNRgj/TIu6LAmZDOcPMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738154161; 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=uWYT+yf0VKuBRVkoX3AMEfm+wjjSNRTKxVsYnZ+CBiI=; b=MACXAfbILGRw7pR47a38rHm3/yh+mz1SeuDZLdu96XPWwvstobcYhcTmhBf5GOOfP+cV0h 2afd8BuAC1hJ+k+kV0Fr6+0XWx9I88gtKPrN2PQFJbDW6X+lt7DRAyYYjzNW8YCZalpqxG RkGo0XcKtIQO6eJv9Scq1cdSj65ff1jd9pI3XUCSVmGhBaaJGEs9oNRwlZYnniJk8Onmwe o4VNJNF0rRupVnr6g8sMMEkQI25ekITcSsrjyTMIDa+uyXLN18/XpypPybpUWpOCMegGHy ISumvUsPNz+KtQW8bpCTskRBoIBpiowsMIgxxfqAcLZR0Mbp8K3E7s1Vh/OIjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738154161; a=rsa-sha256; cv=none; b=iVVudfLXy6kgmEi4frYjkleth6mA7Tmh6pXdmiUiccjnQx0qkFlQIzTcPyEQTMpApkpzxr fgPX7BR4K5DcYPYPFjqCNuiU9TX9LBL8lqjwRgdo9RNVhrRqhaWTgqkDpXebMUqdJWbhpo 8nF7XvPEojCRFDh3ZfO+Ji0670IE0Z2xy/b+T6aU59Bkhh75TnD/o2TxPtHBpfU9BD1R+r UvQ3pNZYhv+A8Nd0euGbXBngi980iVGxhmMFc44yYJzXw9x+FmVCLRyEo2ed+y5J2uQxyi 96Xp6PY+Zat3Hr8KaQfqC03YQ+uwAb1vAbjJMMXRZ7KfNqCMv+f7a8gg0/jdAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YjhTX68Rdz11Qd; Wed, 29 Jan 2025 12:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50TCa0mZ051441; Wed, 29 Jan 2025 12:36:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TCa00T051438; Wed, 29 Jan 2025 12:36:00 GMT (envelope-from git) Date: Wed, 29 Jan 2025 12:36:00 GMT Message-Id: <202501291236.50TCa00T051438@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 6285abfcf3c2 - stable/14 - nl(1): Capsicumise the utility 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6285abfcf3c2ba5faefed44a38604823f7ced9b1 Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=6285abfcf3c2ba5faefed44a38604823f7ced9b1 commit 6285abfcf3c2ba5faefed44a38604823f7ced9b1 Author: Faraz Vahedi AuthorDate: 2024-10-13 20:03:25 +0000 Commit: Mariusz Zaborski CommitDate: 2025-01-29 09:51:31 +0000 nl(1): Capsicumise the utility Signed-off-by: Faraz Vahedi Reviewed by: markj, oshogbo MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1465 (cherry picked from commit dfd52321b7beba716fa2bdd4f54e57e9ac806e96) --- usr.bin/nl/nl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c index de4314155ff1..e0c9f21b45d4 100644 --- a/usr.bin/nl/nl.c +++ b/usr.bin/nl/nl.c @@ -49,6 +49,8 @@ __COPYRIGHT( #include #include +#include + typedef enum { number_all, /* number all lines */ number_nonempty, /* number non-empty lines */ @@ -251,6 +253,11 @@ main(int argc, char *argv[]) /* NOTREACHED */ } + /* Limit standard descriptors and enter capability mode */ + caph_cache_catpages(); + if (caph_limit_stdio() < 0 || caph_enter() < 0) + err(EXIT_FAILURE, "capsicum"); + /* Generate the delimiter sequence */ memcpy(delim, delim1, delim1len); memcpy(delim + delim1len, delim2, delim2len);